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 | dc76e70b2a2382ce1ba9c31e0568940915c1cc15 (patch) | |
| tree | cdda62eb15ddc308f29da8541865603da899e440 /clang/tools/driver/CMakeLists.txt | |
| parent | 16638f9a2ce04badcf59ea356c928c9e1deb0ec9 (diff) | |
| download | bcm5719-llvm-dc76e70b2a2382ce1ba9c31e0568940915c1cc15.tar.gz bcm5719-llvm-dc76e70b2a2382ce1ba9c31e0568940915c1cc15.zip | |
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
llvm-svn: 259872
Diffstat (limited to 'clang/tools/driver/CMakeLists.txt')
| -rw-r--r-- | clang/tools/driver/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt index c6818af5ae1..ffcfbb505ae 100644 --- a/clang/tools/driver/CMakeLists.txt +++ b/clang/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) |
