diff options
| author | Greg Noel <GregNoel@tigris.org> | 2008-08-14 23:33:59 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2008-08-14 23:33:59 (GMT) |
| commit | 709f13823dd52c40dd3ae3f0aacc9c193dcebd45 (patch) | |
| tree | ec33c3407731afa1ad3b8df6b9c03cd40d6637c6 /src/engine | |
| parent | 29f24368b0b236f816e6bc124547c1a155c00ad6 (diff) | |
| download | SCons-709f13823dd52c40dd3ae3f0aacc9c193dcebd45.zip SCons-709f13823dd52c40dd3ae3f0aacc9c193dcebd45.tar.gz SCons-709f13823dd52c40dd3ae3f0aacc9c193dcebd45.tar.bz2 | |
Issue 2162: YACC fix for OS X
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/yacc.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/engine/SCons/Tool/yacc.py b/src/engine/SCons/Tool/yacc.py index 0b648e8..3d13dd0 100644 --- a/src/engine/SCons/Tool/yacc.py +++ b/src/engine/SCons/Tool/yacc.py @@ -109,12 +109,15 @@ def generate(env): env['YACCCOM'] = '$YACC $YACCFLAGS -o $TARGET $SOURCES' env['YACCHFILESUFFIX'] = '.h' - if env['PLATFORM'] == 'darwin': - # Bison on Mac OS X just appends ".h" to the generated target .cc - # or .cpp file name. Hooray for delayed expansion of variables. - env['YACCHXXFILESUFFIX'] = '${TARGET.suffix}.h' - else: - env['YACCHXXFILESUFFIX'] = '.hpp' + # Apparently, OS X now creates file.hpp like everybody else + # I have no idea when it changed; it was fixed in 10.4 + #if env['PLATFORM'] == 'darwin': + # # Bison on Mac OS X just appends ".h" to the generated target .cc + # # or .cpp file name. Hooray for delayed expansion of variables. + # env['YACCHXXFILESUFFIX'] = '${TARGET.suffix}.h' + #else: + # env['YACCHXXFILESUFFIX'] = '.hpp' + env['YACCHXXFILESUFFIX'] = '.hpp' env['YACCVCGFILESUFFIX'] = '.vcg' |