From 52beec76de83934b9be4448deb3a509b224e4a7e Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Thu, 31 Oct 2019 21:17:23 +0000 Subject: [PATCH] Fix compiler-rt build on macOS without XCode Summary: Starting with 8a5bfbe6db2824642bf9a1d27a24c5b6132b244f (D68292) this file unconditionally uses xcodebuild to get the SDK version. On my system this always fails with `xcode-select: error: tool 'xcodebuild' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance` Reviewers: delcypher, yln Reviewed By: delcypher, yln Subscribers: dberris, mgorny, #sanitizers, llvm-commits Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D69610 --- compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index 4667cc0..96a5526 100644 --- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -49,7 +49,7 @@ function(find_darwin_sdk_version var sdk_name) if(NOT DARWIN_PREFER_PUBLIC_SDK) # Let's first try the internal SDK, otherwise use the public SDK. execute_process( - COMMAND xcodebuild -version -sdk ${sdk_name}.internal SDKVersion + COMMAND xcrun --sdk ${sdk_name}.internal --show-sdk-version RESULT_VARIABLE result_process OUTPUT_VARIABLE var_internal OUTPUT_STRIP_TRAILING_WHITESPACE @@ -58,7 +58,7 @@ function(find_darwin_sdk_version var sdk_name) endif() if((NOT ${result_process} EQUAL 0) OR "" STREQUAL "${var_internal}") execute_process( - COMMAND xcodebuild -version -sdk ${sdk_name} SDKVersion + COMMAND xcrun --sdk ${sdk_name} --show-sdk-version RESULT_VARIABLE result_process OUTPUT_VARIABLE var_internal OUTPUT_STRIP_TRAILING_WHITESPACE -- 2.7.4