[counting_allocator] macOS buildtools/ changes.

third_party/libc++/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 
 # Used by libc++ and libc++abi.
 config("config") {
   defines = [ "LIBCXX_BUILDING_LIBCXXABI" ]
   cflags = [
     "-fPIC",
     "-fstrict-aliasing",
     "-pthread",
   ]
   cflags_cc = [
     "-nostdinc++",
     "-isystem" + rebase_path("trunk/include", root_build_dir),
     "-isystem" + rebase_path("../libc++abi/trunk/include", root_build_dir),
     "-std=c++11",
   ]
 }
 
-shared_library("libc++") {
+static_library("libc++_static") {
   sources = [
     "trunk/src/algorithm.cpp",
     "trunk/src/any.cpp",
     "trunk/src/bind.cpp",
     "trunk/src/chrono.cpp",
     "trunk/src/condition_variable.cpp",
     "trunk/src/debug.cpp",
     "trunk/src/exception.cpp",
     "trunk/src/future.cpp",
     "trunk/src/hash.cpp",
@@ skipping 61 matching lines @@
     # -nodefaultlibs on mac doesn't add any kind of runtime libraries.
     # These runtimes have to be added manually.
     lib_dirs = [ "//third_party/llvm-build/Release+Asserts/lib/clang/$clang_version/lib/darwin" ]
 
     if (is_asan) {
       libs += [ "clang_rt.asan_osx_dynamic" ]
     }
   }
 }
 
+shared_library("libc++") {
+  deps = [ ":libc++_static" ]
+}
+
 group("libcxx_proxy") {
   deps = [
     ":libc++",
   ]
   public_configs = [ ":link_helper" ]
 }
 
 # This config is only used by binaries and shared library targets.
 # //build/config/sanitizers:default_sanitizer_flags sets the include paths for
 # everything else.
 config("link_helper") {
   ldflags = [
     "-stdlib=libc++",
   ]
 
   if (!is_mac) {
     ldflags += [
       # Normally the generator takes care of RPATH. Our case is special because
       # the generator is unaware of the libc++.so dependency. Note that setting
       # RPATH here is a potential security issue. See the following for another
       # example of this issue: https://code.google.com/p/gyp/issues/detail?id=315
       "-Wl,-rpath,\$ORIGIN/",
     ]
   }
 
   lib_dirs = [ root_build_dir ]
 }