diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 10:14:55 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 10:14:55 +0000 |
| commit | a371017f943dca2aa9b986ac77251658d66309d4 (patch) | |
| tree | 7dda36e78d8ae6bba1845d6e7fbd336167773ea0 /build | |
| parent | ec229bc9712b5fed0a0e8a377cc4497885ea1274 (diff) | |
| download | chromium_src-a371017f943dca2aa9b986ac77251658d66309d4.zip chromium_src-a371017f943dca2aa9b986ac77251658d66309d4.tar.gz chromium_src-a371017f943dca2aa9b986ac77251658d66309d4.tar.bz2 | |
Revert 66265 - Remove -no-integrated-as flag for Clang/Linux builder.
BUG=61931
TEST=still builds
Review URL: http://codereview.chromium.org/4976002
TBR=hans@chromium.org
Review URL: http://codereview.chromium.org/5216006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index abfe14c..92b974f 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1168,6 +1168,9 @@ # 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. |