aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BOOTSTRAP-WINDOWS-CLANG.cli18
-rw-r--r--UPGRADE.cli4
-rw-r--r--build-clang.bat.in13
3 files changed, 16 insertions, 19 deletions
diff --git a/BOOTSTRAP-WINDOWS-CLANG.cli b/BOOTSTRAP-WINDOWS-CLANG.cli
index b03773c..3429c5a 100644
--- a/BOOTSTRAP-WINDOWS-CLANG.cli
+++ b/BOOTSTRAP-WINDOWS-CLANG.cli
@@ -92,10 +92,9 @@ Then, we rebuild the build system with the result of Phase 1 linking libraries
statically.
\
-> build2\b-boot ^
- config.cxx=clang++ ^
- config.cc.coptions=-m64 ^
- config.bin.lib=static ^
+> build2\b-boot ^
+ \"config.cxx=clang++ -m64\" ^
+ config.bin.lib=static ^
build2\exe{b}
> move /y build2\b.exe build2\b-boot.exe
@@ -114,8 +113,7 @@ libraries and then staged:
> cd .. # Back to build2-toolchain-X.Y.Z\
> build2\build2\b-boot configure ^
- config.cxx=clang++ ^
- config.cc.coptions=-m64 ^
+ \"config.cxx=clang++ -m64\" ^
config.bin.lib=shared ^
config.bin.suffix=-stage ^
config.install.root=C:\build2 ^
@@ -160,8 +158,8 @@ prefix/suffix, etc):
\
> build2\build2\b-boot configure ^
config.config.hermetic=true ^
- config.cxx=clang++ ^
- \"config.cc.coptions=-m64 -O2\" ^
+ \"config.cxx=clang++ -m64\" ^
+ config.cc.coptions=-O2 ^
config.bin.lib=shared ^
config.install.root=C:\build2
@@ -206,8 +204,8 @@ previous step and you may want/need to make similar adjustments.
> bpkg-stage create ^
cc ^
config.config.hermetic=true ^
- config.cxx=clang++ ^
- \"config.cc.coptions=-m64 -O2\" ^
+ \"config.cxx=clang++ -m64\" ^
+ config.cc.coptions=-O2 ^
config.bin.lib=shared ^
config.install.root=C:\build2
\
diff --git a/UPGRADE.cli b/UPGRADE.cli
index a1e8441..f5fcc65 100644
--- a/UPGRADE.cli
+++ b/UPGRADE.cli
@@ -236,8 +236,8 @@ For Windows with Clang (from a suitable command prompt, see
> bpkg-stage create ^
cc ^
config.config.hermetic=true ^
- config.cxx=clang++ ^
- \"config.cc.coptions=-m64 -O2\" ^
+ \"config.cxx=clang++ -m64\" ^
+ config.cc.coptions=-O2 ^
config.bin.lib=shared ^
config.install.root=C:\build2
\
diff --git a/build-clang.bat.in b/build-clang.bat.in
index f04fd1a..ce250db 100644
--- a/build-clang.bat.in
+++ b/build-clang.bat.in
@@ -296,9 +296,9 @@ if not "_%1_" == "__" (
)
if not "_%compile_ops%_" == "__" (
- set coptions="config.cc.coptions=-m64%compile_ops%"
+ set coptions="config.cc.coptions=%compile_ops%"
) else (
- set coptions="config.cc.coptions=-m64 -O2"
+ set coptions="config.cc.coptions=-O2"
)
if not "_%link_ops%_" == "__" (
@@ -475,7 +475,7 @@ cmd /C bootstrap-clang.bat %cxx% -m64 -w
build2\b-boot --version
@if errorlevel 1 goto error
-build2\b-boot %verbose% %jobs% config.cxx=%cxx% config.cc.coptions=-m64 config.bin.lib=static build2\exe{b}
+build2\b-boot %verbose% %jobs% "config.cxx=%cxx% -m64" config.bin.lib=static build2\exe{b}
@if errorlevel 1 goto error
move /y build2\b.exe build2\b-boot.exe
@@ -492,7 +492,7 @@ cd ..
build2\build2\b-boot %verbose% configure^
config.config.hermetic=true^
- config.cxx=%cxx%^
+ "config.cxx=%cxx% -m64"^
%coptions%^
%loptions%^
config.bin.lib=shared^
@@ -575,8 +575,7 @@ goto end
:stage
build2\build2\b-boot %verbose% configure^
- config.cxx=%cxx%^
- config.cc.coptions=-m64^
+ "config.cxx=%cxx% -m64"^
config.bin.lib=shared^
config.bin.suffix=%stage_suffix%^
config.install.root=%idir%^
@@ -614,7 +613,7 @@ cd %cdir%
%bpkg_stage% %verbose% create^
cc^
config.config.hermetic=true^
- config.cxx=%cxx%^
+ "config.cxx=%cxx% -m64"^
%coptions%^
%loptions%^
config.bin.lib=shared^