[CMake] One more try to make CMake clean up after itself

Seriously... CMake... You're on my list...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@259873 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca2305e306940cee6216cd8a5cd24a91c496a0ce..7542bb46160edb20a182b1e7ac4d5f72c13ef9ec 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -586,6 +586,10 @@ if( CLANG_INCLUDE_DOCS )
   add_subdirectory(docs)
 endif()
 
+if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/clang.order")
+  file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/clang.order")
+endif()
+
 if(CLANG_ORDER_FILE STREQUAL "${CMAKE_CURRENT_BINARY_DIR}/clang.order")
   unset(CLANG_ORDER_FILE CACHE)
   unset(CLANG_ORDER_FILE)

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index ffcfbb505ae391fb48101c60a9c8a663b3a4da85..bb631db79c3f22337e58e355555b402267eca6ce 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -87,7 +87,7 @@ if (APPLE)
   set(TOOL_INFO_BUILD_VERSION)
 endif()
 
-if(CLANG_ORDER_FILE)
+if(CLANG_ORDER_FILE AND EXISTS CLANG_ORDER_FILE)
   target_link_libraries(clang "-Wl,-order_file,${CLANG_ORDER_FILE}")
 endif()