From c9660933637b69a14ae870397a53b086a8d6ab85 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 14 Jan 2014 06:33:29 +0000 Subject: 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@1557946 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index c57061c0e3..c77b753727 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/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") -- cgit v1.2.1