summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2019-12-06 09:08:53 -0500
committerNico Weber <thakis@chromium.org>2019-12-06 09:09:25 -0500
commit133a92f87cbad8a9a6a5e23a70c63112bb973c28 (patch)
tree23f959aefde0c4a87c806faf45765b7b283f47c3
parent8c714c93023d7d039a23fb47c8256570ba54b9c7 (diff)
downloadbcm5719-llvm-133a92f87cbad8a9a6a5e23a70c63112bb973c28.tar.gz
bcm5719-llvm-133a92f87cbad8a9a6a5e23a70c63112bb973c28.zip
gn build: Unbreak mac build after 4066591
-rw-r--r--llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn6
1 files changed, 5 insertions, 1 deletions
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 f0fdae1c1c0..a95613c5bcd 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 != "") {
OpenPOWER on IntegriCloud