diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 23:20:38 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 23:20:38 +0000 |
| commit | 58cfa44c0acaa816621b49753aba8345ecb8c876 (patch) | |
| tree | 61c3791d72c6205106af176fddbc4d868f40ab0c /build | |
| parent | 84658a60566f556b4053215439608e1dd07b96fb (diff) | |
| download | chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.zip chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.tar.gz chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.tar.bz2 | |
* Get linux building with the merge branch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index e596917..5b1b464 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -322,7 +322,8 @@ elif env['PLATFORM'] == 'posix': excluded_warnings = [ # TODO: Clean up uses of ext/hash_map and remove this. # (see unordered_map and base/hash_tables.h) - '-Wno-deprecated' # Needed for using ext/hash_map on GCC 4.3 + '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 + '-Wno-unknown-pragmas' # In wtf's ref counting system ] env.Replace( CCFLAGS = ['-m32', '-g', '-pthread'], |