diff options
| author | Joe George <joe@zeroc.com> | 2016-03-28 14:31:23 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-28 14:31:23 -0400 |
| commit | c8fd4738fda9a36086b933fe0c05161fb0aae015 (patch) | |
| tree | 27460653c0e03f18d968d31bcdb21750c604cd25 /cpp/src/IceUtil/Exception.cpp | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| parent | Enabling server network tracing causes browser JavaScript tests to hang (diff) | |
| download | ice-c8fd4738fda9a36086b933fe0c05161fb0aae015.tar.bz2 ice-c8fd4738fda9a36086b933fe0c05161fb0aae015.tar.xz ice-c8fd4738fda9a36086b933fe0c05161fb0aae015.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceUtil/Exception.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index aa3700ca604..3a57e1ba797 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -30,7 +30,7 @@ #if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && \ - !(defined(__ARMEL__) && defined(__linux)) + !defined(ICE_STATIC_LIBS) # include <execinfo.h> # include <cxxabi.h> # define ICE_GCC_STACK_TRACES |