diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 18:55:33 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 18:55:33 +0000 |
| commit | f3626dae84105bbde85f7b896e34af0e2bf9596d (patch) | |
| tree | c25cd96f8ef0acac0f4607790b29be2fb034b17a | |
| parent | 9508698f4833e0e916707ad8c3fe9b2718344b66 (diff) | |
| download | chromium_src-f3626dae84105bbde85f7b896e34af0e2bf9596d.zip chromium_src-f3626dae84105bbde85f7b896e34af0e2bf9596d.tar.gz chromium_src-f3626dae84105bbde85f7b896e34af0e2bf9596d.tar.bz2 | |
Commit of http://codereview.chromium.org/4417005/show for thakis.
BUG=61931
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65089 0039d316-1c4b-4281-b951-d872f2087c98
| -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 42ccd77..ab2d892 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1156,6 +1156,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. |