Commits

Anonymous committed b24169a

Issue 2162: YACC fix for OS X

  • Participants
  • Parent commits 0e43150

Comments (0)

Files changed (2)

File src/engine/SCons/Tool/yacc.py

     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'
 

File test/YACC/live.py

 bar = Environment(YACC = r'%(_python_)s wrapper.py ' + yacc)
 foo.Program(target = 'foo', source = 'foo.y')
 bar.Program(target = 'bar', source = 'bar.y')
-foo.Program(target = 'hello', source = ['hello.cpp']) 
+foo.Program(target = 'hello', source = ['hello.cpp'])
 foo.CXXFile(target = 'file.cpp', source = ['file.yy'], YACCFLAGS='-d')
 foo.CFile(target = 'not_foo', source = 'foo.y')
 """ % locals())
 %%
 """)
 
-import sys
-if sys.platform[:6] == 'darwin':
-   file_hpp = 'file.cpp.h'
-else:
-   file_hpp = 'file.hpp'
+# Apparently, OS X now creates file.hpp like everybody else
+# I have no idea when it changed; it was fixed in 10.4
+#import sys
+#if sys.platform[:6] == 'darwin':
+#   file_hpp = 'file.cpp.h'
+#else:
+#   file_hpp = 'file.hpp'
+file_hpp = 'file.hpp'
 
 test.write("hello.cpp", """\
 #include "%(file_hpp)s"