summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-10-23 11:27:05 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-23 18:28:05 +0000
commit9fe937fb45fd57da5988abde1e0afc9a7c8bb5d5 (patch)
treef16f0fb5f1bbe859ff6e494ad78455901c158b60 /.gitignore
parent7ebc013e977a3f77b8eddefeba6c16a98a813c2c (diff)
downloadchromium_src-9fe937fb45fd57da5988abde1e0afc9a7c8bb5d5.zip
chromium_src-9fe937fb45fd57da5988abde1e0afc9a7c8bb5d5.tar.gz
chromium_src-9fe937fb45fd57da5988abde1e0afc9a7c8bb5d5.tar.bz2
Revert of mac: In static library builds, link against a static libc++.a (patchset #3 id:40001 of https://codereview.chromium.org/1413863003/ )
Reason for revert: Broke Mac ASan x64: http://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%2064%20Builder/builds/27061 FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang -Wl,-search_paths_first -fsanitize=address -Wl,-pie -Wl,-u,__sanitizer_options_link_helper -Wl,-dead_strip -mmacosx-version-min=10.6 -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -arch x86_64 -L. -stdlib=libc++ -o tls_edit obj/native_client/src/tools/tls_edit/tls_edit.tls_edit.o libsanitizer_options.a libplatform.a librdfa_validator.a libgio.a '-L../../third_party/libc++-static' && (export BUILT_FRAMEWORKS_DIR=/b/build/slave/Mac_ASan_64_Builder/build/src/out/Release; export BUILT_PRODUCTS_DIR=/b/build/slave/Mac_ASan_64_Builder/build/src/out/Release; export CONFIGURATION=Release; export EXECUTABLE_NAME=tls_edit; export EXECUTABLE_PATH=tls_edit; export FULL_PRODUCT_NAME=tls_edit; export PRODUCT_NAME=tls_edit; export PRODUCT_TYPE=com.apple.product-type.tool; export SDKROOT=/Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk; export SRCROOT=/b/build/slave/Mac_ASan_64_Builder/build/src/out/Release/../../native_client/src/tools/tls_edit; export SOURCE_ROOT="${SRCROOT}"; export TARGET_BUILD_DIR=/b/build/slave/Mac_ASan_64_Builder/build/src/out/Release; export TEMP_DIR="${TMPDIR}"; (cd ../../native_client/src/tools/tls_edit && ../../../../build/mac/change_mach_o_flags_from_xcode.sh && ../../../../build/mac/strip_from_xcode); G=$?; ((exit $G) || rm -rf tls_edit) && exit $G) ld: library not found for -lc++abi Original issue's description: > 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). > > 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 > R=mark@chromium.org > > Committed: https://chromium.googlesource.com/chromium/src/+/494270d01189f8b4b2b4ebd501fd980833489729 TBR=mark@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=400091 Review URL: https://codereview.chromium.org/1424573002 Cr-Commit-Position: refs/heads/master@{#355837}
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 88cf776..ef33bc3 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++.a
+/third_party/libc++-static/libc++-static.a
/third_party/libaddressinput/src
/third_party/libexif/sources
/third_party/libjingle/source