From 74c3f7dc5bd1e0d491de8ee9c52c50ec391e8bb8 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 13 Feb 2014 11:19:11 +0000 Subject: [PATCH] [CMake] llvm_add_library(MODULE) may use CMAKE_MODULE_LINKER_FLAGS instead of target property LINK_FLAGS. I mis-dropped Darwin's link flags (in clang side) since r201073. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201317 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/AddLLVM.cmake | 6 ------ cmake/modules/HandleLLVMOptions.cmake | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index a253e133699..44193b79381 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -287,12 +287,6 @@ ${name} ignored.") llvm_add_library(${name} MODULE ${ARGN}) set_target_properties( ${name} PROPERTIES PREFIX "" ) - if (APPLE) - # Darwin-specific linker flags for loadable modules. - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-flat_namespace -Wl,-undefined -Wl,suppress") - endif() - if( EXCLUDE_FROM_ALL ) set_target_properties( ${name} PROPERTIES EXCLUDE_FROM_ALL ON) else() diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index ebe9d864d9c..f132803b55b 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -105,6 +105,11 @@ set(LTDL_SHLIB_EXT ${CMAKE_SHARED_LIBRARY_SUFFIX}) # We use *.dylib rather than *.so on darwin. set(LLVM_PLUGIN_EXT ${CMAKE_SHARED_LIBRARY_SUFFIX}) +if(APPLE) + # Darwin-specific linker flags for loadable modules. + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined -Wl,suppress") +endif() + function(add_flag_or_print_warning flag) check_c_compiler_flag(${flag} C_SUPPORTS_FLAG) check_cxx_compiler_flag(${flag} CXX_SUPPORTS_FLAG) -- 2.34.1