diff options
| author | Junyan He <junyan.he@linux.intel.com> | 2014-09-16 11:12:10 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-09-16 12:27:21 +0800 |
| commit | 774cb1078594d8151418b97deec00935f7034ac2 (patch) | |
| tree | 0253747f6d564fff23aa296b85f4a9287187f0ca | |
| parent | 6b7648768be9b0bb4a3090b0a590311f09d57824 (diff) | |
Fix the bug of LLVM_LFLAGS fail to set
The LLVM_LFLAGS is used before finding the LLVM package,
which causes the CMake fails to set correct -L flags and
cause linkage error.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | CMake/FindLLVM.cmake | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake index 556b3a9..5fb996d 100644 --- a/CMake/FindLLVM.cmake +++ b/CMake/FindLLVM.cmake @@ -3,7 +3,7 @@ # LLVM_INCLUDE_DIR - where to find llvm include files # LLVM_LIBRARY_DIR - where to find llvm libs # LLVM_CFLAGS - llvm compiler flags -# LLVM_LFLAGS - llvm linker flags +# LLVM_LDFLAGS - llvm linker flags # LLVM_MODULE_LIBS - list of llvm libs for working with modules. # LLVM_FOUND - True if llvm found. if (LLVM_INSTALL_DIR) @@ -62,7 +62,7 @@ execute_process( execute_process( COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags - OUTPUT_VARIABLE LLVM_LFLAGS + OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5decd6..4046f29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,6 @@ elseif (COMPILER STREQUAL "ICC") endif () set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof -fno-rtti") set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}") -set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LFLAGS}") set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DGBE_DEBUG=1") set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1") set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0") @@ -96,6 +95,8 @@ set (CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DGBE_DEBUG=0") #INCLUDE(CMake/FindLLVM.cmake) Find_Package(LLVM 3.3) +set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LDFLAGS}") + # XLib Find_Package(X11) IF(X11_FOUND) |