[llvm-branch-commits] [llvm] 0e72f19 - [gn build] only build iOS builtins with full Xcode

Nico Weber via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Dec 10 13:27:55 PST 2020


Author: Nico Weber
Date: 2020-12-10T16:22:31-05:00
New Revision: 0e72f1978d64dff1094f9da024d7f45fd3f984f8

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

LOG: [gn build] only build iOS builtins with full Xcode

Commandline tools doesn't include the iOS SDK.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
index 5444f6621350..af23e330b6ef 100644
--- a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
@@ -1,4 +1,5 @@
 import("//llvm/lib/Target/targets.gni")
+import("//llvm/utils/gn/build/mac_sdk.gni")
 import("//llvm/utils/gn/build/toolchain/compiler.gni")
 
 # In the GN build, compiler-rt is always built by just-built clang and lld.
@@ -19,7 +20,8 @@ group("compiler-rt") {
 
   # FIXME: Do this only if a gn arg compiler_rt_enable_ios is set?
   # That would match the cmake build.
-  if (host_os == "mac") {
+  # iOS SDKs aren't available in the commandline tools SDK.
+  if (host_os == "mac" && !mac_use_commandline_tools_sdk) {
     if (llvm_build_AArch64) {
       deps += [ "//compiler-rt/lib/builtins(//llvm/utils/gn/build/toolchain:stage2_ios_aarch64)" ]
     }


        


More information about the llvm-branch-commits mailing list