From 19d5d451523823e05d44193ab3106c471d8ebc9d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 23 Jun 2023 10:04:21 +0200
Subject: Redo build-clang.bat to pass -m64 as compiler mode options

---
 build-clang.bat.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'build-clang.bat.in')

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^
-- 
cgit v1.1