diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-03-19 21:11:55 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-03-19 21:11:55 (GMT) |
| commit | 611c86b7d18b2d2f9e188d656f27c8dffee235ed (patch) | |
| tree | e50769bdc0eeb833cd09c4e05f578c953ac14b4b /Tools/buildbot/build-amd64.bat | |
| parent | 0ccfe5f2a0ea5aebd33c0c3b5354551a57205f32 (diff) | |
| download | cpython-611c86b7d18b2d2f9e188d656f27c8dffee235ed.zip cpython-611c86b7d18b2d2f9e188d656f27c8dffee235ed.tar.gz cpython-611c86b7d18b2d2f9e188d656f27c8dffee235ed.tar.bz2 | |
Fix the x64 Windows build environment used by the buildbots. %VS90COMNTOOLS%\vsvars32.bat is fine for 32-bit builds, but doesn't work for x64 builds, regardless of /MACHINE:AMD64 and /USECL:MS_OPTERON flags passed to cl.exe. Launch the x86_64 cross compilation environment via '%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat x86_amd64'. I don't have access to any systems *without* Visual Studio 2008 Professional installed (i.e. just Express Edition), so I can't test if x64 compilation works w/ VS Express at the moment.
Additionally, force a clean in our build.bat files before building, just whilst we're going through these build system updates.
And finally, add in the missing MACHINE=AMD64 option to our Tcl/Tk x64 build.
Diffstat (limited to 'Tools/buildbot/build-amd64.bat')
| -rw-r--r-- | Tools/buildbot/build-amd64.bat | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat index b74086e..0425d19 100644 --- a/Tools/buildbot/build-amd64.bat +++ b/Tools/buildbot/build-amd64.bat @@ -1,5 +1,6 @@ @rem Used by the buildbot "compile" step. cmd /c Tools\buildbot\external-amd64.bat -call "%VS90COMNTOOLS%vsvars32.bat" +call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 REM cmd /q/c Tools\buildbot\kill_python.bat +cmd /c Tools\buildbot\clean-amd64.bat vcbuild PCbuild\pcbuild.sln "Debug|x64" |