From c9c17144c1e270f4a8f6454aaabbe825a7c3cbc4 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 18 Feb 2021 11:57:38 -0500 Subject: [PATCH] [gn build] fix mistake in 0ec448194e29 --- llvm/utils/gn/build/mac_sdk.gni | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/llvm/utils/gn/build/mac_sdk.gni b/llvm/utils/gn/build/mac_sdk.gni index 46249bf..51cc56c 100644 --- a/llvm/utils/gn/build/mac_sdk.gni +++ b/llvm/utils/gn/build/mac_sdk.gni @@ -15,15 +15,14 @@ if (sysroot == "") { # long and almost everyone has Xcode installed. So require that people who # don't have it installed set a gn arg. if (mac_use_commandline_tools_sdk) { - ios_sdk_path = "/Library/Developer/CommandLineTools/SDKs/iPhoneOS.sdk" - iossim_sdk_path = - "/Library/Developer/CommandLineTools/SDKs/iPhoneSimulator.sdk" mac_sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" - } else { - mac_sdk_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" # iOS SDKs aren't available in the commandline tools SDK. - have_ios_sdks = true + have_ios_sdks = false + } else { + mac_sdk_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + ios_sdk_path = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk" + iossim_sdk_path = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk" } } else { ios_sdk_path = rebase_path(sysroot, root_build_dir) + "/iPhoneOS.sdk" -- 2.7.4