diff options
| author | Vladimir Prus <ghost@cs.msu.su> | 2009-11-08 14:04:20 +0000 |
|---|---|---|
| committer | Vladimir Prus <ghost@cs.msu.su> | 2009-11-08 14:04:20 +0000 |
| commit | a2ff1da73e221f93c214166bfb4d19d20c27da39 (patch) | |
| tree | 40d2cdf88ba2a44870166a7f6f1a1a83ab600aad /bootstrap.bat | |
| parent | 3a6f9697918d93b19a814c4c8534a24d8849e752 (diff) | |
| download | boost-a2ff1da73e221f93c214166bfb4d19d20c27da39.tar.gz | |
Merge: Make bootstrap.bat work on 64-bit Windows
[SVN r57486]
Diffstat (limited to 'bootstrap.bat')
| -rw-r--r-- | bootstrap.bat | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index ed166dd30b..1913d46d8d 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -7,15 +7,24 @@ REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.t ECHO Building Boost.Jam build engine
if exist ".\tools\jam\src\bin.ntx86\bjam.exe" del tools\jam\src\bin.ntx86\bjam.exe
+if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" del tools\jam\src\bin.ntx86_64\bjam.exe
cd tools\jam\src
call .\build.bat > ..\..\..\bjam.log
@ECHO OFF
cd ..\..\..
-if not exist ".\tools\jam\src\bin.ntx86\bjam.exe" goto :bjam_failure
+if exist ".\tools\jam\src\bin.ntx86\bjam.exe" (
+ copy .\tools\jam\src\bin.ntx86\bjam.exe . > nul
+ goto :bjam_built)
-copy .\tools\jam\src\bin.ntx86\bjam.exe . > nul
+if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" (
+ copy .\tools\jam\src\bin.ntx86_64\bjam.exe . > nul
+ goto :bjam_built)
+
+goto :bjam_failure
+
+:bjam_built
REM Ideally, we should obtain the toolset that build.bat has
REM guessed. However, it uses setlocal at the start and does
|