summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 15:43:35 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 15:43:35 +0000
commita1332facbb3e56714fef8f19839cebecac22ad64 (patch)
treebe554449e16830df6464c31cc6f4e5d099294334 /build
parent8d0d0b3dd3f73762206b1f7bc7a4e4fa5cc2c961 (diff)
downloadchromium_src-a1332facbb3e56714fef8f19839cebecac22ad64.zip
chromium_src-a1332facbb3e56714fef8f19839cebecac22ad64.tar.gz
chromium_src-a1332facbb3e56714fef8f19839cebecac22ad64.tar.bz2
Enable -integrated-as for Clang builds on Linux.
Clang needs to be r120563 or later. BUG=none TEST=none Review URL: http://codereview.chromium.org/5573002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi3
1 files changed, 0 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 1b260cd..f07ec08 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1168,9 +1168,6 @@
# http://code.google.com/p/googletest/source/detail?r=446 .
# TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
'-Wno-unnamed-type-template-args',
- # The integrated assembler chokes on one ffmpeg file.
- # http://crbug.com/61931
- '-no-integrated-as',
],
'cflags!': [
# Clang doesn't seem to know know this flag.