summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bootstrap.py3
-rw-r--r--src/CHANGES.txt5
2 files changed, 7 insertions, 1 deletions
diff --git a/bootstrap.py b/bootstrap.py
index a04dbc8f..3f761389 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -24,6 +24,7 @@
import os
import os.path
import sys
+import subprocess
__doc__ = """bootstrap.py
@@ -200,7 +201,7 @@ sys.stdout.flush()
os.environ['SCONS_LIB_DIR'] = os.path.join(bootstrap_dir, src_engine)
-os.execve(sys.executable, args, os.environ)
+sys.exit(subprocess.Popen(args, env=os.environ).wait())
# Local Variables:
# tab-width:4
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0df4d370..d87427c7 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,6 +7,11 @@
RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+ From Anatoly Techtonik:
+
+ - use subprocess in bootstrap.py instead of os.execve to avoid
+ losing output control on Windows (http://bugs.python.org/issue9148)
+
From Alexander Goomenyuk:
- Add .sx to assembly source scanner list so .sx files