summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2019-12-06 10:21:22 -0800
committerPeter Collingbourne <peter@pcc.me.uk>2019-12-06 15:53:54 -0800
commit3131249204bcb85e506332ea07a3101b7f656fce (patch)
treefb481f6e2d068256ae83463e5bb2f16d87d1abb6
parenteff08f40976e177923fe95759917e59375458f71 (diff)
downloadbcm5719-llvm-3131249204bcb85e506332ea07a3101b7f656fce.tar.gz
bcm5719-llvm-3131249204bcb85e506332ea07a3101b7f656fce.zip
gn build: Change scudo's list of supported platforms to a whitelist.
Scudo only supports building for android/linux/fuchsia, so require target_os to be one of linux/fuchsia to do a stage2_unix scudo build. Android is already covered by the stage2_android* toolchains below. Differential Revision: https://reviews.llvm.org/D71131
-rw-r--r--llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn6
1 files changed, 1 insertions, 5 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 a95613c5bcd..7ceb4d88dfa 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/BUILD.gn
@@ -1,11 +1,7 @@
import("//llvm/utils/gn/build/toolchain/compiler.gni")
supported_toolchains = []
-# 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") {
+if (target_os == "linux" || target_os == "fuchsia") {
supported_toolchains += [ "//llvm/utils/gn/build/toolchain:stage2_unix" ]
}
if (android_ndk_path != "") {
OpenPOWER on IntegriCloud