diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-01-14 06:33:29 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-01-14 06:33:29 +0000 |
| commit | 32f8955f8ca1d76729c2997e527c445d72ca05fb (patch) | |
| tree | a1d28368c0e0963c92821f5a379442d5e571a893 /cpp/src | |
| parent | 1066e3dc783b034c41d1c574a7cb9f7f8158a88a (diff) | |
| download | qpid-python-32f8955f8ca1d76729c2997e527c445d72ca05fb.tar.gz | |
Don't use a linkmap to cut down the exported library symbols if
the compiler if gcc 4.1.2 (as used in RHEL 5). This fixes a crash
in the unit tests somehow triggered by adding the work in QPID-5415.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1557946 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index c57061c0e3..c77b753727 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -183,14 +183,11 @@ if (CMAKE_COMPILER_IS_GNUCXX) set (HIDE_SYMBOL_FLAGS "-fno-visibility-inlines-hidden") else (GCC_VERSION VERSION_EQUAL 4.1.2) set (HIDE_SYMBOL_FLAGS "-fno-visibility-inlines-hidden -fvisibility=hidden") + set (QPID_LINKMAP ${CMAKE_CURRENT_SOURCE_DIR}/qpid.linkmap) + set (LINK_VERSION_SCRIPT_FLAG "-Wl,--version-script=${QPID_LINKMAP}") endif (GCC_VERSION VERSION_EQUAL 4.1.2) endif (CMAKE_COMPILER_IS_GNUCXX) -if (CMAKE_SYSTEM_NAME STREQUAL Linux) - set (QPID_LINKMAP ${CMAKE_CURRENT_SOURCE_DIR}/qpid.linkmap) - set (LINK_VERSION_SCRIPT_FLAG "-Wl,--version-script=${QPID_LINKMAP}") -endif (CMAKE_SYSTEM_NAME STREQUAL Linux) - if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) set (COMPILER_FLAGS "-library=stlport4 -mt") set (WARNING_FLAGS "+w") |