diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 12:12:50 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 12:12:50 +0000 |
| commit | 1a97581dd016215706c46b821f3fd47cf563ef33 (patch) | |
| tree | 1a7f780d71b80ae0a0c1a4a16c0138ec0bffd4a2 /webkit/build/port | |
| parent | 04c8f4e473a35eac3be2f34ca3971eb950f20fba (diff) | |
| download | chromium_src-1a97581dd016215706c46b821f3fd47cf563ef33.zip chromium_src-1a97581dd016215706c46b821f3fd47cf563ef33.tar.gz chromium_src-1a97581dd016215706c46b821f3fd47cf563ef33.tar.bz2 | |
One more step towards working Mac SCons build.
Unbreak bison usage and zlib warnings.
BUG=5525
Review URL: http://codereview.chromium.org/16507
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/port')
| -rw-r--r-- | webkit/build/port/SConscript | 16 |
1 files changed, 9 insertions, 7 deletions
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') |