diff options
author | Chris Bieneman <beanz@apple.com> | 2015-12-19 05:47:50 +0000 |
---|---|---|
committer | Chris Bieneman <beanz@apple.com> | 2015-12-19 05:47:50 +0000 |
commit | 3ba7676a44285db27db4e475187040d928434e29 (patch) | |
tree | 3828c8484e8a89f719b91d82f5460cc67b7924e8 /CMakeLists.txt | |
parent | 964b97cc6102412b23fdfe29d999e020ce58a3a0 (diff) |
Revert "[CMake] Support a simple case for bootstrap builds to generate PGO data"
This reverts commit r256069, which was an unintentional tag along on
another commit.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256088 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ad2ac42c40..2c54e751e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -631,19 +631,11 @@ if (CLANG_ENABLE_BOOTSTRAP) string(REGEX MATCH "stage([0-9]*)" MATCHED_STAGE "${CLANG_STAGE}") if(MATCHED_STAGE) - if(NOT LLVM_BUILD_INSTRUMENTED) - math(EXPR STAGE_NUM "${CMAKE_MATCH_1} + 1") - set(NEXT_CLANG_STAGE stage${STAGE_NUM}) - else() - set(NEXT_CLANG_STAGE stage${CMAKE_MATCH_1}) - endif() + math(EXPR STAGE_NUM "${MATCHED_STAGE} + 1") + set(NEXT_CLANG_STAGE stage${STAGE_NUM}) else() set(NEXT_CLANG_STAGE bootstrap) endif() - - if(BOOTSTRAP_LLVM_BUILD_INSTRUMENTED) - set(NEXT_CLANG_STAGE ${NEXT_CLANG_STAGE}-instrumented) - endif() message(STATUS "Setting next clang stage to: ${NEXT_CLANG_STAGE}") @@ -689,26 +681,6 @@ if (CLANG_ENABLE_BOOTSTRAP) set(RUNTIME_DEP compiler-rt) endif() - set(COMPILER_OPTIONS - -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++ - -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang - -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) - - if(BOOTSTRAP_LLVM_BUILD_INSTRUMENTED) - set(PGO_DEP llvm-profdata) - set(PGO_OPT -DLLVM_PROFDATA=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-profdata) - endif() - - if(LLVM_BUILD_INSTRUMENTED) - set(PGO_DEP generate-profdata) - set(PGO_OPT -DLLVM_PROFDATA_FILE=${CMAKE_CURRENT_BINARY_DIR}/utils/perf-training/clang.profdata) - set(COMPILER_OPTIONS - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_ASM_COMPILER=${CMAKE_ASM_COMPILER}) - set(RUNTIME_DEP) # Don't set runtime dependencies - endif() - # Find all variables that start with BOOTSTRAP_ and populate a variable with # them. get_cmake_property(variableNames VARIABLES) @@ -731,7 +703,7 @@ if (CLANG_ENABLE_BOOTSTRAP) endforeach() ExternalProject_Add(${NEXT_CLANG_STAGE} - DEPENDS clang ${LTO_DEP} ${RUNTIME_DEP} ${PGO_DEP} + DEPENDS clang ${LTO_DEP} ${RUNTIME_DEP} PREFIX ${NEXT_CLANG_STAGE} SOURCE_DIR ${CMAKE_SOURCE_DIR} STAMP_DIR ${STAMP_DIR} @@ -743,9 +715,11 @@ if (CLANG_ENABLE_BOOTSTRAP) -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} ${CLANG_BOOTSTRAP_CMAKE_ARGS} ${PASSTHROUGH_VARIABLES} - -DCLANG_STAGE=${NEXT_CLANG_STAGE} - ${COMPILER_OPTIONS} - ${LTO_LIBRARY} ${LTO_AR} ${LTO_RANLIB} ${verbose} ${PGO_OPT} + -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++ + -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang + -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang + -DCLANG_STAGE=${NEXT_CLANG_STAGE} + ${LTO_LIBRARY} ${LTO_AR} ${LTO_RANLIB} ${verbose} INSTALL_COMMAND "" STEP_TARGETS configure build ${cmake_3_4_USES_TERMINAL_OPTIONS} |