diff options
| author | Steven Knight <knight@baldmt.com> | 2008-04-21 06:38:31 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-04-21 06:38:31 (GMT) |
| commit | 736666c4435e553e13b69e57339ec91c9f4f2824 (patch) | |
| tree | 512353b30aa2af47f79bcd816ea27ac65cf1303f /test/CXX | |
| parent | a6391f26d941d3cba4ec4bf6c499d38e2ce4a014 (diff) | |
| download | SCons-736666c4435e553e13b69e57339ec91c9f4f2824.zip SCons-736666c4435e553e13b69e57339ec91c9f4f2824.tar.gz SCons-736666c4435e553e13b69e57339ec91c9f4f2824.tar.bz2 | |
Merged revisions 2880-2883,2885-2895 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core
........
r2885 | stevenknight | 2008-04-18 21:38:59 -0700 (Fri, 18 Apr 2008) | 2 lines
Update troubleshooting appendix for new Taskmaster output.
........
r2886 | bdbaddog | 2008-04-19 15:15:03 -0700 (Sat, 19 Apr 2008) | 5 lines
Fix infinite loop in Fortran tool initialization.
Bug 2017.
Steven fixed, I tested.
........
r2887 | garyo | 2008-04-20 17:44:46 -0700 (Sun, 20 Apr 2008) | 1 line
Added this in two sections; simple one when discussing simple builds, and an example in the VariantDir section showing how it still works there.
........
r2888 | stevenknight | 2008-04-20 21:33:01 -0700 (Sun, 20 Apr 2008) | 4 lines
Accomodate test/MSVC/msvc.py's reliance on the Windows Platform SDK
(for now) by making use of the user's %INCLUDE% and %LIB% variables.
Split some independent embedded subtests into their own test scripts.
........
r2889 | stevenknight | 2008-04-20 21:38:05 -0700 (Sun, 20 Apr 2008) | 2 lines
Windows portability fix (line endings).
........
r2890 | stevenknight | 2008-04-20 21:44:24 -0700 (Sun, 20 Apr 2008) | 2 lines
Update Windows portion of if:-elif: block for a variable name change.
........
r2891 | stevenknight | 2008-04-20 21:52:41 -0700 (Sun, 20 Apr 2008) | 3 lines
On Windows, escape backslashes on the --interactive command line input,
so people can build targets in other directories.
........
r2892 | stevenknight | 2008-04-20 21:56:50 -0700 (Sun, 20 Apr 2008) | 3 lines
Fix ripple effects on Windows from redefining how $CXXFLAGS gets
added to C++ command lines.
........
r2893 | stevenknight | 2008-04-20 22:04:50 -0700 (Sun, 20 Apr 2008) | 4 lines
Handle a ripple effect from redefining the file() and open() builtin
functions by explicitly restoring the originals whenever we reset
the global state between tests.
........
r2894 | stevenknight | 2008-04-20 23:17:23 -0700 (Sun, 20 Apr 2008) | 2 lines
Remove by-hand backslash escaping, now that --interactive mode is handling it.
........
r2895 | stevenknight | 2008-04-20 23:23:04 -0700 (Sun, 20 Apr 2008) | 2 lines
Mention the fix for the Fortran suffix out-of-memory bug
........
Diffstat (limited to 'test/CXX')
| -rw-r--r-- | test/CXX/CCFLAGS.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/CXX/CCFLAGS.py b/test/CXX/CCFLAGS.py index a559de3..a867340 100644 --- a/test/CXX/CCFLAGS.py +++ b/test/CXX/CCFLAGS.py @@ -34,8 +34,10 @@ import TestSCons test = TestSCons.TestSCons() test.write('SConstruct', """ -foo = Environment(CCFLAGS = '-DFOO', CXXFLAGS = '-DCXX') -bar = Environment(CCFLAGS = '-DBAR', CXXFLAGS = '-DCXX') +foo = Environment() +foo.Append(CCFLAGS = '-DFOO', CXXFLAGS = '-DCXX') +bar = Environment() +bar.Append(CCFLAGS = '-DBAR', CXXFLAGS = '-DCXX') foo_obj = foo.Object(target = 'foo', source = 'prog.cpp') bar_obj = bar.Object(target = 'bar', source = 'prog.cpp') foo.Program(target = 'foo', source = foo_obj) |