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 /tools/driver | |
| 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 'tools/driver')
| -rw-r--r-- | tools/driver/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt index c6818af5ae..ffcfbb505a 100644 --- a/tools/driver/CMakeLists.txt +++ b/tools/driver/CMakeLists.txt @@ -87,12 +87,8 @@ if (APPLE) set(TOOL_INFO_BUILD_VERSION) endif() -check_cxx_compiler_flag("-Wl,-order_file,${CLANG_ORDER_FILE}" - LINKER_HAS_ORDER_FILE_FLAG) - -if(LINKER_HAS_ORDER_FILE_FLAG AND CLANG_ORDER_FILE) +if(CLANG_ORDER_FILE) target_link_libraries(clang "-Wl,-order_file,${CLANG_ORDER_FILE}") - set_target_properties(clang PROPERTIES LINK_DEPENDS ${CLANG_ORDER_FILE}) endif() if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) |