diff options
| author | Matthias Braun <matze@braunis.de> | 2017-02-11 00:14:01 +0000 |
|---|---|---|
| committer | Matthias Braun <matze@braunis.de> | 2017-02-11 00:14:01 +0000 |
| commit | 59797eccea63cd5a8a901df5942125108bf57a7f (patch) | |
| tree | 636afefe110890ce8d0bd946d2eefcd7a375ea20 | |
| parent | 027340f3b9fa0ddbf14ca7db1129111524e99de9 (diff) | |
| download | bcm5719-llvm-59797eccea63cd5a8a901df5942125108bf57a7f.tar.gz bcm5719-llvm-59797eccea63cd5a8a901df5942125108bf57a7f.zip | |
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.
llvm-svn: 294811
| -rwxr-xr-x | llvm/cmake/config-ix.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 6bd2b535500..e2b4bf999a4 100755 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -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 |
