summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 13:13:00 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 13:13:00 +0000
commitb29fc215b73e4f86416027f69b43f22ce7a1c1e1 (patch)
tree18f9a61ce46ed718b845141f6a0d6437f632dba0
parent913790c666b02ff408551f937e0b26b502f9a098 (diff)
downloadchromium_src-b29fc215b73e4f86416027f69b43f22ce7a1c1e1.zip
chromium_src-b29fc215b73e4f86416027f69b43f22ce7a1c1e1.tar.gz
chromium_src-b29fc215b73e4f86416027f69b43f22ce7a1c1e1.tar.bz2
Clean up the obsolete asan=1 config bits:
-- 10.5 isn't supported anymore, so we don't need to pass -Wl,-U for undefined symbols -- third_party/llvm-build is now used for ASan, so the Chromium clang plugins should be fully supported. TBR=thakis Review URL: https://chromiumcodereview.appspot.com/10908010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154128 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/common.gypi17
1 files changed, 0 insertions, 17 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 8be3bd7..642929e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1199,11 +1199,6 @@
['asan==1', {
'clang%': 1,
- # Do not use Chrome plugins for Clang. The Clang version in
- # third_party/asan may be different from the default one.
- # TODO(glider): this isn't true anymore, need to check if we can use the
- # plugins now.
- 'clang_use_chrome_plugins%': 0,
}],
['asan==1 and OS=="mac"', {
# See http://crbug.com/145503.
@@ -2914,18 +2909,6 @@
'xcode_settings': {
'OTHER_LDFLAGS': [
'-faddress-sanitizer',
- # The symbols below are referenced in the ASan runtime
- # library (compiled on OS X 10.6), but may be unavailable
- # on the prior OS X versions. Because Chromium is
- # currently targeting 10.5.0, we need to explicitly mark
- # these symbols as dynamic_lookup.
- '-Wl,-U,_malloc_default_purgeable_zone',
- '-Wl,-U,_malloc_zone_memalign',
- '-Wl,-U,_dispatch_sync_f',
- '-Wl,-U,_dispatch_async_f',
- '-Wl,-U,_dispatch_barrier_async_f',
- '-Wl,-U,_dispatch_group_async_f',
- '-Wl,-U,_dispatch_after_f',
],
},
}],