summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenjamin reed <bcr33d@gmail.com>2019-08-01 00:09:07 (GMT)
committerbenjamin reed <bcr33d@gmail.com>2019-08-01 00:09:07 (GMT)
commit7b0ca02591b88f5b86d1a8a57b3fb12c97cca21f (patch)
tree9a4fa1b9bf7f8a0b5150bc8d28a5d4f0ca016b15
parentb947140417e2641331106036ed3b30e981942edd (diff)
downloadSCons-7b0ca02591b88f5b86d1a8a57b3fb12c97cca21f.zip
SCons-7b0ca02591b88f5b86d1a8a57b3fb12c97cca21f.tar.gz
SCons-7b0ca02591b88f5b86d1a8a57b3fb12c97cca21f.tar.bz2
make expected flag order match the order passed.
-rw-r--r--src/engine/SCons/EnvironmentTests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 8355f26..70e1a37 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -2026,8 +2026,8 @@ def generate(env):
"-Ffwd2 " + \
"-F fwd3 " + \
"-pthread " + \
- "-mno-cygwin -mwindows " + \
"-fmerge-all-constants " + \
+ "-mno-cygwin -mwindows " + \
"-arch i386 -isysroot /tmp " + \
"-iquote /usr/include/foo1 " + \
"-isystem /usr/include/foo2 " + \