From c486541fea5db3a329132949c61ecf443aac3aea Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Mon, 25 Jul 2016 18:54:30 +0000 Subject: [PATCH] [CMake] Cleaning up some CMake warnings In Bootstrap builds Clang logs some warnings. These are caused because Clang passes CLANG_STAGE and BOOTSTRAP_DEFAULT_PASSTHROUGH into the next stage's configuration. BOOTSTRAP_DEFAULT_PASSTHROUGH shouldn't be passed, so it is renamed to _BOOTSTRAP_DEFAULT_PASSTHROUGH, to prevent passthrough. CLANG_STAGE should be passed, so I've changed the code to log it if it is set outside the if(CLANG_ENABLE_BOOTSTRAP) block. This makes the variable always used, so the warning goes away. llvm-svn: 276674 --- clang/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 417b2c6..4916c51 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -463,12 +463,15 @@ endif() add_subdirectory(cmake/modules) +if(CLANG_STAGE) + message(STATUS "Setting current clang stage to: ${CLANG_STAGE}") +endif() + if (CLANG_ENABLE_BOOTSTRAP) include(ExternalProject) if(NOT CLANG_STAGE) set(CLANG_STAGE stage1) - message(STATUS "Setting current clang stage to: ${CLANG_STAGE}") endif() string(REGEX MATCH "stage([0-9]*)" MATCHED_STAGE "${CLANG_STAGE}") @@ -526,7 +529,7 @@ if (CLANG_ENABLE_BOOTSTRAP) set(verbose -DCMAKE_VERBOSE_MAKEFILE=On) endif() - set(BOOTSTRAP_DEFAULT_PASSTHROUGH + set(_BOOTSTRAP_DEFAULT_PASSTHROUGH PACKAGE_VERSION LLVM_VERSION_MAJOR LLVM_VERSION_MINOR @@ -577,7 +580,7 @@ if (CLANG_ENABLE_BOOTSTRAP) endforeach() # Populate the passthrough variables - foreach(variableName ${CLANG_BOOTSTRAP_PASSTHROUGH} ${BOOTSTRAP_DEFAULT_PASSTHROUGH}) + foreach(variableName ${CLANG_BOOTSTRAP_PASSTHROUGH} ${_BOOTSTRAP_DEFAULT_PASSTHROUGH}) if(${variableName}) string(REPLACE ";" "\;" value ${${variableName}}) list(APPEND PASSTHROUGH_VARIABLES -- 2.7.4