From f3626dae84105bbde85f7b896e34af0e2bf9596d Mon Sep 17 00:00:00 2001 From: "mirandac@chromium.org" Date: Thu, 4 Nov 2010 18:55:33 +0000 Subject: 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 --- build/common.gypi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build') 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. -- cgit v1.1