summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-04-12 18:43:39 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-04-12 18:43:39 (GMT)
commit445611e53e033c40b0646922aa10f9bd21b90392 (patch)
tree403fe98cc84c6f9ffcdcce6f17a74fc7a6aba2cd /Modules
parentc53119641f17f33f70ac0d4757e532d033c8625f (diff)
parentd468a2c2cb854471d5ee53b064c973839f76330b (diff)
downloadCMake-445611e53e033c40b0646922aa10f9bd21b90392.zip
CMake-445611e53e033c40b0646922aa10f9bd21b90392.tar.gz
CMake-445611e53e033c40b0646922aa10f9bd21b90392.tar.bz2
Merge topic 'refine-XL-rules'
d468a2c XL: Avoid copying archives into shared libraries that link them
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Compiler/XL.cmake17
1 files changed, 17 insertions, 0 deletions
diff --git a/Modules/Compiler/XL.cmake b/Modules/Compiler/XL.cmake
index f5331d3..d07890f 100644
--- a/Modules/Compiler/XL.cmake
+++ b/Modules/Compiler/XL.cmake
@@ -18,6 +18,12 @@ if(__COMPILER_XL)
endif()
set(__COMPILER_XL 1)
+# Find the CreateExportList program that comes with this toolchain.
+find_program(CMAKE_XL_CreateExportList
+ NAMES CreateExportList
+ DOC "IBM XL CreateExportList tool"
+ )
+
macro(__compiler_xl lang)
# Feature flags.
set(CMAKE_${lang}_VERBOSE_FLAG "-V")
@@ -28,4 +34,15 @@ macro(__compiler_xl lang)
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-g")
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
+
+ # The compiler front-end passes all object files, archive files, and shared
+ # library files named on the command line to CreateExportList to create a
+ # list of all symbols to be exported from the shared library. This causes
+ # all archive members to be copied into the shared library whether they are
+ # needed or not. Instead we run the tool ourselves to pass only the object
+ # files so that we export only the symbols actually provided by the sources.
+ set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+ "${CMAKE_XL_CreateExportList} <OBJECT_DIR>/objects.exp <OBJECTS>"
+ "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -Wl,-bE:<OBJECT_DIR>/objects.exp <CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
+ )
endmacro()