summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-10-24 00:16:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-24 07:17:43 +0000
commitf8a27cca3c79ca9c8f6bf701aa2cb8bbbc8b3059 (patch)
treef050913c4c20bf8ad2baad4abefda92f2f49b1c7 /.gitignore
parent0fceaeddf5408ab60dccc2c2b45ca066caf50396 (diff)
downloadchromium_src-f8a27cca3c79ca9c8f6bf701aa2cb8bbbc8b3059.zip
chromium_src-f8a27cca3c79ca9c8f6bf701aa2cb8bbbc8b3059.tar.gz
chromium_src-f8a27cca3c79ca9c8f6bf701aa2cb8bbbc8b3059.tar.bz2
mac: In static library builds, link against a static libc++.a
To achieve this, just add a -Lthird_party/libc++-static flag to the link line, and add a postbuild that checks that Chromium Framework depends on neither libstdc++.dylib nor libc++.dylib Use the existing verify_order postbuild for this, and let it not run in component builds (since what it checks for isn't interesting in that config, and we do depend on system libc++ in component builds). Also don't do this in asan builds. asan already requires OS X 10.7+. And don't do this for targets below native_client, since those still use the 10.6 SDK (!). This change is small but subtle, see thread "[chromium-dev] Intent to implement: Statically linking libc++ for Chrome/Mac" and the document linked from comment 14 on the bug for details. Ideally, this has no observable behavior change. If it looks like this breaks tests somewhere, especially on 10.6, please revert. (The bots like it, and the things I tried on 10.6 worked too, though.) BUG=400091,544325 R=mark@chromium.org Committed: https://chromium.googlesource.com/chromium/src/+/494270d01189f8b4b2b4ebd501fd980833489729 Committed: https://chromium.googlesource.com/chromium/src/+/0f56cff872068cef226e7ad3f9701eb41d4eb2f5 Review URL: https://codereview.chromium.org/1413863003 Cr-Commit-Position: refs/heads/master@{#355966}
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ef33bc3..88cf776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -335,7 +335,7 @@ v8.log
/third_party/khronos_glcts
/third_party/leveldatabase/src
/third_party/leveldb
-/third_party/libc++-static/libc++-static.a
+/third_party/libc++-static/libc++.a
/third_party/libaddressinput/src
/third_party/libexif/sources
/third_party/libjingle/source