diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-16 19:02:14 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-16 19:02:14 (GMT) |
| commit | 6b0e5745ab7c874841952cf0d503ad7bede4a82f (patch) | |
| tree | 563784e67f0ac79f9d0c7922c0732702b29edd99 | |
| parent | a7213b3e63688896428aa5ab9714d79c9d363d7c (diff) | |
| download | CMake-6b0e5745ab7c874841952cf0d503ad7bede4a82f.zip CMake-6b0e5745ab7c874841952cf0d503ad7bede4a82f.tar.gz CMake-6b0e5745ab7c874841952cf0d503ad7bede4a82f.tar.bz2 | |
ENH: add -Wl,-relax to the default linker flags for BlueGene, otherwise you can get "relocation truncated to fit" errors
Alex
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/BlueGeneL.cmake | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index e7eac31..c5a7b60 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -108,6 +108,7 @@ MACRO(PYTHON_ADD_MODULE _NAME ) ENDIF(PYTHON_MODULE_${_NAME}_BUILD_SHARED) SET(PY_MODULES_LIST ${PY_MODULES_LIST} ${_NAME} CACHE STRING "Collect a list of all added python modules" FORCE) + message(STATUS "modules: ${PY_MODULES_LIST}") ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN}) # TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES}) ENDIF(PYTHON_ENABLE_MODULE_${_NAME}) diff --git a/Modules/Platform/BlueGeneL.cmake b/Modules/Platform/BlueGeneL.cmake index b104ad9..1eb5072 100644 --- a/Modules/Platform/BlueGeneL.cmake +++ b/Modules/Platform/BlueGeneL.cmake @@ -23,15 +23,10 @@ INCLUDE(Platform/UnixPaths) IF(CMAKE_COMPILER_IS_GNUCC) SET(CMAKE_C_LINK_EXECUTABLE - "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-lgcc,-lc -lnss_files -lnss_dns -lresolv") + "<CMAKE_C_COMPILER> -Wl,-relax <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-lgcc,-lc -lnss_files -lnss_dns -lresolv") ENDIF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_LINK_EXECUTABLE - "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-lstdc++,-lgcc,-lc -lnss_files -lnss_dns -lresolv") + "<CMAKE_CXX_COMPILER> -Wl,-relax <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-lstdc++,-lgcc,-lc -lnss_files -lnss_dns -lresolv") ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -SET(CMAKE_CXX_LINK_SHARED_LIBRARY) -SET(CMAKE_CXX_LINK_MODULE_LIBRARY) -SET(CMAKE_C_LINK_SHARED_LIBRARY) -SET(CMAKE_C_LINK_MODULE_LIBRARY) |