summaryrefslogtreecommitdiff
path: root/test/YACC
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2008-08-14 23:33:59 +0000
committerGreg Noel <GregNoel@tigris.org>2008-08-14 23:33:59 +0000
commit043196428907109dff7112dd7cd4ab4df857e0a2 (patch)
treeec33c3407731afa1ad3b8df6b9c03cd40d6637c6 /test/YACC
parentca25531823d55f75e617bf717176102e44e703f2 (diff)
downloadscons-043196428907109dff7112dd7cd4ab4df857e0a2.tar.gz
Issue 2162: YACC fix for OS X
Diffstat (limited to 'test/YACC')
-rw-r--r--test/YACC/live.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/test/YACC/live.py b/test/YACC/live.py
index 3c5050ec..88cbafbe 100644
--- a/test/YACC/live.py
+++ b/test/YACC/live.py
@@ -56,7 +56,7 @@ yacc = foo.Dictionary('YACC')
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())
@@ -103,11 +103,14 @@ graph: GRAPH_T
%%
""")
-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"