diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-23 15:27:01 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-23 15:27:01 -0500 |
| commit | 656d310b2c5e0d5c20d8f4c0e662119d2ebbb142 (patch) | |
| tree | 627e11d78ffe806426452f6a2b7365444184dbcd /cpp/test/IceUtil/stacktrace/Client.cpp | |
| parent | Fixed Linux armhf build failure (diff) | |
| download | ice-656d310b2c5e0d5c20d8f4c0e662119d2ebbb142.tar.bz2 ice-656d310b2c5e0d5c20d8f4c0e662119d2ebbb142.tar.xz ice-656d310b2c5e0d5c20d8f4c0e662119d2ebbb142.zip | |
Build shared executables with -fPIE/-pie on Linux
Diffstat (limited to 'cpp/test/IceUtil/stacktrace/Client.cpp')
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/Client.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index ffafedbb9ec..f7e7c84b652 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -223,7 +223,12 @@ int main(int argc, char* argv[]) if(!optimized && IceUtilInternal::stackTraceImpl() == IceUtilInternal::STLibbacktracePlus) { + // Libbacktrace with GCC 4.8 and pie return a smaller backtrace +# if defined(__pie__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 408) + filename += ".libbacktrace+48pie"; +# else filename += ".libbacktrace+"; +# endif } #endif @@ -241,6 +246,9 @@ int main(int argc, char* argv[]) return EXIT_FAILURE; } + // Show which template we use: + cout << filename << "... "; + stringstream sstr; sstr << ifs.rdbuf(); #if defined(__APPLE__) |