summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--SConstruct5
-rw-r--r--src/CHANGES.txt1
2 files changed, 5 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index c4ce97e..b52acaf 100644
--- 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 0d3a12a..0039c32 100644
--- 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