[llvm] 133a92f - gn build: Unbreak mac build after 4066591

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2019-12-06T09:09:25-05:00
New Revision: 133a92f87cbad8a9a6a5e23a70c63112bb973c28

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

LOG: gn build: Unbreak mac build after 4066591

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn
index f0fdae1c1c00..a95613c5bcd9 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn
@@ -1,7 +1,11 @@
 import("//llvm/utils/gn/build/toolchain/compiler.gni")
 
 supported_toolchains = []
-if (target_os != "win") {
+# FIXME: On macOS, stage2_unix currently doesn't copy libc++ headers to
+# the out dir, but clang relies on them on mac to compile code that uses C++
+# standard library headers. scudo needs C++ standard library headers, so disable
+# this on mac until stage2_unix correctly copies libc++ headers.
+if (target_os != "win" && target_os != "mac")  {
   supported_toolchains += [ "//llvm/utils/gn/build/toolchain:stage2_unix" ]
 }
 if (android_ndk_path != "") {