Skip to content

Commit cd43bf7

Browse files
authored
Merge pull request #4692 from mwichmann/fix/ccflags-typo
Fix typos in CCFLAGS test
2 parents 86887eb + 32a0f69 commit cd43bf7

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

CHANGES.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ NOTE: Since SCons 4.9.0, Python 3.7.0 or above is required.
1212

1313
RELEASE VERSION/DATE TO BE FILLED IN LATER
1414

15-
From John Doe:
15+
From John Doe:
16+
- Whatever John Doe did.
1617

17-
- Whatever John Doe did.
18+
From Mats Wichmann:
19+
- Fix typos in CCFLAGS test. Didn't affect the test itself, but
20+
didn't correctly apply the DefaultEnvironment speedup.
1821

1922

2023
RELEASE 4.9.0 - Sun, 02 Mar 2025 17:22:20 -0700

test/CC/CCFLAGS.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
if sys.platform == 'win32':
3232
import SCons.Tool.MSCommon as msc
33-
33+
3434
if not msc.msvc_exists():
3535
fooflags = '-DFOO'
3636
barflags = '-DBAR'
@@ -44,7 +44,7 @@
4444
test = TestSCons.TestSCons()
4545

4646
test.write('SConstruct', """
47-
DefaultEnvironment(tool=[])
47+
DefaultEnvironment(tools=[])
4848
foo = Environment(CCFLAGS = '%s')
4949
bar = Environment(CCFLAGS = '%s')
5050
foo.Object(target = 'foo%s', source = 'prog.c')
@@ -88,8 +88,7 @@
8888
""")
8989

9090
test.write('SConstruct', """
91-
DefaultEnvironment(tool=[])
92-
91+
DefaultEnvironment(tools=[])
9392
bar = Environment(CCFLAGS = '%s')
9493
bar.Object(target = 'foo%s', source = 'prog.c')
9594
bar.Object(target = 'bar%s', source = 'prog.c')

0 commit comments

Comments
 (0)