diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-10-31 07:20:44 (GMT) |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-10-31 07:20:44 (GMT) |
| commit | da25e7ac7d6fdea70c388cd25dc3ee750d18b2e3 (patch) | |
| tree | 6144878fe3a4c4178d5b2ad8fa5cb03ab28cc3fa | |
| parent | 2cfbc721e8d5155f2dabd2ce24f08e469b3aee7f (diff) | |
| download | SCons-da25e7ac7d6fdea70c388cd25dc3ee750d18b2e3.zip SCons-da25e7ac7d6fdea70c388cd25dc3ee750d18b2e3.tar.gz SCons-da25e7ac7d6fdea70c388cd25dc3ee750d18b2e3.tar.bz2 | |
BUG: fix bootstrap on windows 64.
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | src/CHANGES.txt | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -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 |