BUG: fix bootstrap on windows 64.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4379 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/SConstruct b/SConstruct
index c4ce97e570a3f3587a547349e7b0d2a67f718e96..b52acaf6f0253ed162e613120424f63327e7aa70 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -721,7 +721,10 @@ for p in [ scons ]:
     platform_zip = os.path.join(build,
                                 'dist',
                                 "%s.%s.zip" % (pkg_version, platform))
-    win32_exe = os.path.join(build, 'dist', "%s.win32.exe" % pkg_version)
+    if platform == "win-amd64":
+        win32_exe = os.path.join(build, 'dist', "%s.win-amd64.exe" % pkg_version)
+    else:
+        win32_exe = os.path.join(build, 'dist', "%s.win32.exe" % pkg_version)
 
     #
     # Update the environment with the relevant information

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0d3a12a26e51c0b71359c634ccf30f42d6fb355f..0039c32558e4788869be4990eae3247a8b5d9f86 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -15,6 +15,7 @@ RELEASE X.X.X - XXX
     - Do not add -fPIC for ifort tool on non-posix platforms (darwin and
       windows).
     - Fix bug 2294 (spurious CheckCC failures).
+    - Fix scons bootstrap process on windows 64 (wrong wininst name)
 
   From William Deegan:
     - Final merge from vs_revamp branch to main