diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-02-05 03:40:37 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-02-05 03:40:37 +0000 |
| commit | 23347e5957fb4f132bd8ce9df426f3d2d52220c0 (patch) | |
| tree | c80110ec646a60f928a6b95fb140a5a7a77f2a78 /CMakeLists.txt | |
| parent | e46b2e5b14fab7f6f165598db5b944e67101ab00 (diff) | |
Revert "[CMake] Improve the clang order-file generation workflow"
This reverts commit r259862, and attempts to fix builder CMakeCaches.
Will try this again some other time...
Conflicts:
CMakeLists.txt
tools/driver/CMakeLists.txt
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@259872 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bdd0ec9124..ca2305e306 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -586,24 +586,14 @@ if( CLANG_INCLUDE_DOCS ) add_subdirectory(docs) endif() -# this line is needed as a cleanup to ensure that any CMakeCaches with the old -# default value get updated to the new default. -if(CLANG_ORDER_FILE STREQUAL "") +if(CLANG_ORDER_FILE STREQUAL "${CMAKE_CURRENT_BINARY_DIR}/clang.order") unset(CLANG_ORDER_FILE CACHE) + unset(CLANG_ORDER_FILE) endif() -set(CLANG_ORDER_FILE ${CMAKE_CURRENT_BINARY_DIR}/clang.order CACHE FILEPATH +set(CLANG_ORDER_FILE "" CACHE FILEPATH "Order file to use when compiling clang in order to improve startup time.") -file(READ ${CLANG_ORDER_FILE} order_file 20) -if(order_file STREQUAL "") - file(REMOVE ${CLANG_ORDER_FILE}) -endif() - -if(CLANG_ORDER_FILE AND NOT EXISTS ${CLANG_ORDER_FILE}) - file(WRITE ${CLANG_ORDER_FILE} "\n") -endif() - if (CLANG_BUILT_STANDALONE OR CMAKE_VERSION VERSION_EQUAL 3 OR CMAKE_VERSION VERSION_GREATER 3) # Generate a list of CMake library targets so that other CMake projects can |