From: Andrew Trick Date: Wed, 22 Jun 2011 05:44:01 +0000 (+0000) Subject: Only do config-time substitution of LLVM_BUILD_MODE in X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc0f40acc6877c2d1fa7e50decd8ec330a3569a4;p=clang Only do config-time substitution of LLVM_BUILD_MODE in test/lit.site.cfg, not Unit/test/lit.site.cfg. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133609 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0a01e8e72f..701ede9557 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -28,7 +28,6 @@ set(CLANG_TEST_DIRECTORIES set(LLVM_SOURCE_DIR "${LLVM_MAIN_SRC_DIR}") set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}") -set(LLVM_BUILD_MODE "%(build_mode)s") set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/%(build_config)s") set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib/%(build_config)s") set(CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..") @@ -39,10 +38,16 @@ else() set(ENABLE_SHARED 0) endif(BUILD_SHARED_LIBS) +# lit.site.cfg uses the config-time build mode +set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}") + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg) +# Unit/lit.site.cfg substitutes the runtime build_mode +set(LLVM_BUILD_MODE "%(build_mode)s") + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg