[llvm] c9c1714 - [gn build] fix mistake in 0ec448194e29

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 18 08:58:34 PST 2021


Author: Nico Weber
Date: 2021-02-18T11:58:19-05:00
New Revision: c9c17144c1e270f4a8f6454aaabbe825a7c3cbc4

URL: https://github.com/llvm/llvm-project/commit/c9c17144c1e270f4a8f6454aaabbe825a7c3cbc4
DIFF: https://github.com/llvm/llvm-project/commit/c9c17144c1e270f4a8f6454aaabbe825a7c3cbc4.diff

LOG: [gn build] fix mistake in 0ec448194e29

Added: 
    

Modified: 
    llvm/utils/gn/build/mac_sdk.gni

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/mac_sdk.gni b/llvm/utils/gn/build/mac_sdk.gni
index 46249bfb0aa97..51cc56cd9797e 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"


        


More information about the llvm-commits mailing list