diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-04-01 19:36:06 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-04-01 19:36:06 +0000 |
| commit | cde00a55c8021318b64b57161aa2b8cb20ec1bb8 (patch) | |
| tree | 6d37835f80cd7d54ed3eacf9d06a84152c4afd55 /llvm/tools | |
| parent | 5bba75f1a7af0b753908064fb10d32b5d850b5e1 (diff) | |
| download | bcm5719-llvm-cde00a55c8021318b64b57161aa2b8cb20ec1bb8.tar.gz bcm5719-llvm-cde00a55c8021318b64b57161aa2b8cb20ec1bb8.zip | |
Fix assignment of -fPIC to CMAKE_C_FLAGS. Configure llvm-config.in.in
with the contents of CMAKE_C(XX)_FLAGS too, else `llvm-config
--c(xx)flags' doesn't tell the absolute truth.
This comes from PR9603 and is based on a patch by Ryuta Suzuki!
llvm-svn: 128727
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-config/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt index dfbd986aafa..dbaf773a174 100644 --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/llvm/tools/llvm-config/CMakeLists.txt @@ -7,7 +7,7 @@ endif( NOT PERL_FOUND ) set(PERL ${PERL_EXECUTABLE}) set(VERSION PACKAGE_VERSION) -set(PREFIX ${LLVM_BINARY_DIR}) # TODO: Root for `make install'. +set(PREFIX ${CMAKE_INSTALL_PREFIX}) set(abs_top_srcdir ${LLVM_MAIN_SRC_DIR}) set(abs_top_builddir ${LLVM_BINARY_DIR}) execute_process(COMMAND date @@ -91,9 +91,13 @@ add_custom_command(OUTPUT ${FINAL_LIBDEPS} DEPENDS ${LIBDEPS} COMMENT "Checking for cyclic dependencies between LLVM libraries.") -set(C_FLGS "${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(CXX_FLGS "${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(CPP_FLGS "${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +set(C_FLGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +message(STATUS "C_FLGS: ${C_FLGS}") +message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}") +message(STATUS "LLVM_DEFINITIONS: ${LLVM_DEFINITIONS}") +message(STATUS "other: ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}}") +set(CXX_FLGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +set(CPP_FLGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") # We don't want certain flags on the output of # llvm-config --cflags --cxxflags |
