Index: third_party/libc++/BUILD.gn |
diff --git a/third_party/libc++/BUILD.gn b/third_party/libc++/BUILD.gn |
index a236b80ddcb879bf66dfbf92b9354c6a2d563f13..9776d8d7d5fc7bb044b9350b6a7ccd520c74b4db 100644 |
--- a/third_party/libc++/BUILD.gn |
+++ b/third_party/libc++/BUILD.gn |
@@ -40,47 +40,6 @@ config("config") { |
"-fPIC", |
"-fstrict-aliasing", |
] |
- cflags_cc = [ |
- "-nostdinc++", |
- "-isystem" + rebase_path("trunk/include", root_build_dir), |
- "-isystem" + rebase_path("../libc++abi/trunk/include", root_build_dir), |
- "-std=c++11", |
- ] |
- if (is_linux && current_cpu == "arm") { |
- cflags_c = [ "-isystem" + |
- rebase_path("../libunwind/trunk/include", root_build_dir) ] |
- cflags_cc += [ "-isystem" + |
- rebase_path("../libunwind/trunk/include", root_build_dir) ] |
- } |
-} |
- |
-config("no_libstdcpp") { |
- # Make sure we don't link against libc++ or libstdc++. |
- ldflags = [ "-nodefaultlibs" ] |
- |
- # Unfortunately, there's no way to disable linking against just |
- # libc++ (besides using clang instead of clang++); -nodefaultlibs |
- # removes all of the default libraries, so add back the ones that we |
- # need. |
- libs = [ |
- "c", |
- "m", |
- ] |
- |
- if (!is_mac) { |
- libs += [ |
- "gcc_s", |
- "rt", |
- ] |
- } |
- |
- if (is_mac && using_sanitizer) { |
- lib_dirs = [ "//third_party/llvm-build/Release+Asserts/lib/clang/$clang_version/lib/darwin" ] |
- |
- if (is_asan) { |
- libs += [ "clang_rt.asan_osx_dynamic" ] |
- } |
- } |
} |
if (libcpp_is_static) { |
@@ -89,6 +48,7 @@ if (libcpp_is_static) { |
link_target_type = "shared_library" |
} |
target(link_target_type, "libc++") { |
+ visibility = [ "//build/config:exe_and_shlib_deps" ] |
Nico
2017/06/30 20:07:04
Hmm, this adds a cycling dependency between files
Tom Anderson
2017/06/30 21:08:28
Wouldn't that just require rolling buildtools at t
Michael Achenbach
2017/07/03 06:37:57
Our deps roller usually auto-rolls build and build
|
sources = [ |
"trunk/src/algorithm.cpp", |
"trunk/src/any.cpp", |
@@ -127,7 +87,6 @@ target(link_target_type, "libc++") { |
] |
configs += [ |
":config", |
- ":no_libstdcpp", |
"//build/config/compiler:no_chromium_code", |
"//build/config/compiler:rtti", |
"//build/config/sanitizers:sanitizer_options_link_helper", |
@@ -138,10 +97,3 @@ target(link_target_type, "libc++") { |
"//buildtools/third_party/libc++abi", |
] |
} |
- |
-group("libcxx_proxy") { |
- deps = [ |
- ":libc++", |
- ] |
- public_configs = [ ":no_libstdcpp" ] |
-} |