diff options
| -rw-r--r-- | third_party/zlib/zlib.scons | 8 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 16 |
2 files changed, 17 insertions, 7 deletions
diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons index 30de7fb..c62aeb4 100644 --- a/third_party/zlib/zlib.scons +++ b/third_party/zlib/zlib.scons @@ -63,6 +63,14 @@ if env.Bit('windows'): 'contrib/minizip/iowin32.h', ]) +if env.Bit('posix'): + env.Append( + CCFLAGS = [ + '-Wno-parentheses', + '-Wno-unused-variable', + ], + ) + env.ChromeLibrary('zlib', input_files) p = env.ChromeMSVSProject('zlib.vcproj', diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index bb102e0..b7e4c1d 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -572,13 +572,15 @@ def create_h_wrapper(target, source, env): # TODO(sgk): make this a real pseudo-Builder def BuildYacc(env, dir, name, file): - env.Command(['$DERIVED_DIR/%s.cpp' % file, - '$DERIVED_DIR/%s.h' % file], - ['$PORT_DIR/%s/%s.y' % (dir, file)], - ['$YACC -d -p %s ${SOURCES[0].posix} ' % name + - '-o ${TARGET.posix}', - Action(create_h_wrapper), - Delete('${TARGETS[1]}pp')]) + yacc_env = env.Clone() + yacc_env['YACC'] = env.Detect('bison') or 'yacc' + yacc_env.Command(['$DERIVED_DIR/%s.cpp' % file, + '$DERIVED_DIR/%s.h' % file], + ['$PORT_DIR/%s/%s.y' % (dir, file)], + ['$YACC -d -p %s ${SOURCES[0].posix} ' % name + + '-o ${TARGET.posix}', + Action(create_h_wrapper), + Delete('${TARGETS[1]}pp')]) BuildYacc(env, 'xml', 'xpathyy', 'XPathGrammar') BuildYacc(env, 'css', 'cssyy', 'CSSGrammar') |