summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/CMakeLists.txt4
-rw-r--r--clang/tools/driver/CMakeLists.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index ca2305e3069..7542bb46160 100644
--- a/clang/CMakeLists.txt
+++ b/clang/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/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
index ffcfbb505ae..bb631db79c3 100644
--- a/clang/tools/driver/CMakeLists.txt
+++ b/clang/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()
OpenPOWER on IntegriCloud