Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 4adf0ae79e8023f7355b1bb8260f76ab17e661d7..f3004868b729e61b79efae69fcee70d26a14b168 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -15,6 +15,7 @@ if (is_posix) { |
} |
import("//build/toolchain/ccache.gni") |
+import("//build/config/sanitizers/sanitizers.gni") |
declare_args() { |
# Normally, Android builds are lightly optimized, even for debug builds, to |
@@ -175,7 +176,15 @@ config("compiler") { |
"-fsanitize-blacklist=$msan_blacklist_path", |
] |
- # TODO(GYP): Support instrumented libraries and custom libc++. |
+ # TODO(GYP): Support instrumented libraries. |
+ } |
+ |
+ if (use_custom_libcxx) { |
+ cflags_cc += [ "-nostdinc++" ] |
+ include_dirs = [ |
+ "//buildtools/third_party/libc++/trunk/include", |
+ "//buildtools/third_party/libc++abi/trunk/include", |
+ ] |
} |
} |