[llvm] r294811 - config-ix.cmake: Search for CMAKE_XCRUN before using it.
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 10 16:14:01 PST 2017
Author: matze
Date: Fri Feb 10 18:14:01 2017
New Revision: 294811
URL: http://llvm.org/viewvc/llvm-project?rev=294811&view=rev
Log:
config-ix.cmake: Search for CMAKE_XCRUN before using it.
This was previously searched in CMakeLists.txt unconditionally but as of
r294371 it is only searched in some circumstances. Repeating the search
in config-ix.cmake to make this robust and hopefully fix the macOS
Asan+Ubsan jenkins build.
Modified:
llvm/trunk/cmake/config-ix.cmake
Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=294811&r1=294810&r2=294811&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Fri Feb 10 18:14:01 2017
@@ -546,6 +546,9 @@ set(LLVM_BINUTILS_INCDIR "" CACHE PATH
"PATH to binutils/include containing plugin-api.h for gold plugin.")
if(CMAKE_HOST_APPLE AND APPLE)
+ if(NOT CMAKE_XCRUN)
+ find_program(CMAKE_XCRUN NAMES xcrun)
+ endif()
if(CMAKE_XCRUN)
execute_process(COMMAND ${CMAKE_XCRUN} -find ld
OUTPUT_VARIABLE LD64_EXECUTABLE
More information about the llvm-commits
mailing list