diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 19:33:55 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 19:33:55 +0000 |
| commit | 9437d6addab64725b7d2647bca4769015a7de70d (patch) | |
| tree | f960ca01f59a09bf714a5d23e0e7996a1bb619c6 /webkit/SConscript | |
| parent | f42cd7e6a3f47c5db3843cd02bc4969ea3a3bf68 (diff) | |
| download | chromium_src-9437d6addab64725b7d2647bca4769015a7de70d.zip chromium_src-9437d6addab64725b7d2647bca4769015a7de70d.tar.gz chromium_src-9437d6addab64725b7d2647bca4769015a7de70d.tar.bz2 | |
-Wno-multichar isn't a MSVC compiler option;
move it to non-Windows initialization.
Review URL: http://codereview.chromium.org/6452
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 0333f25..233233a 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -100,12 +100,7 @@ env.Prepend( ], ) -webkit_excluded_warnings = [ - '-Wno-multichar', -] - env.Append( - CXXFLAGS = webkit_excluded_warnings, WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore", PENDING_DIR = "$WEBKIT_DIR/pending", PORT_DIR = "$WEBKIT_DIR/port", @@ -202,7 +197,10 @@ if env['PLATFORM'] == 'win32': '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32', ]) else: - env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8']) + env.Prepend( + CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'], + CXXFLAGS = ['-Wno-multichar'], + ) env.SConscript(sconscript_dirs, exports=['env', 'env_res']) |