summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 14:00:39 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 14:00:39 +0000
commit31614e47185cc042aea09ea2c77cc4900e6bfe6c (patch)
tree523985e9b4410375ee7c82098b1667aa1a4129de /build
parent886ddda8838696bdf5d6bd4cd311214bb0c94690 (diff)
downloadchromium_src-31614e47185cc042aea09ea2c77cc4900e6bfe6c.zip
chromium_src-31614e47185cc042aea09ea2c77cc4900e6bfe6c.tar.gz
chromium_src-31614e47185cc042aea09ea2c77cc4900e6bfe6c.tar.bz2
Remove -no-integrated-as flag for Clang/Linux builder.
BUG=61931 TEST=still builds Review URL: http://codereview.chromium.org/4976002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66265 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 02b99c7..eabeb26 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.