diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/SConscript | 4 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 2b48314..4615a2d 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -207,6 +207,7 @@ sconscript_dirs = [ 'build/JavaScriptCore/SConscript', 'build/port/SConscript', 'build/V8Bindings/SConscript', + 'build/WebCore/SConscript', 'default_plugin/SConscript', 'glue/SConscript', 'glue/plugins/test/SConscript', @@ -220,9 +221,6 @@ if env['PLATFORM'] == 'win32': 'activex_shim/SConscript', 'activex_shim_dll/SConscript', 'build/localized_strings/SConscript', - 'build/WebCore/SConscript', # This almost works on linux. It requires - # some changes to WebKit that we'll get - # in the merge. ]) env.Append( diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ce0307a..7728ca5 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -31,10 +31,10 @@ if env['PLATFORM'] in ('darwin', 'posix'): 'GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY', ] ) - if '-Wall' in env['CCFLAGS']: + if '-Wall' in env['CXXFLAGS'] and '-Werror' in env['CXXFLAGS']: # It'd be nice to fix these warnings upstream, but we're not going to # block on it. - env['CCFLAGS'].remove('-Werror') + env['CXXFLAGS'].remove('-Werror') input_files = [ '$WEBCORE_DIR/css/CSSBorderImageValue.cpp', |