diff options
Diffstat (limited to 'build-clang.bat.in')
-rw-r--r-- | build-clang.bat.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/build-clang.bat.in b/build-clang.bat.in index c983aae..dd38fc3 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:~1%" ) else ( - set coptions="config.cc.coptions=-m64 -O2" + set coptions="config.cc.coptions=-O2" ) if not "_%link_ops%_" == "__" ( @@ -448,6 +448,9 @@ set "BDEP_DEF_OPT=0" @rem Bootstrap. @rem +@rem Note: disable all warnings since we cannot do anything more granular +@rem during bootstrap stage 1. +@rem cd build2 @if "_%make%_" == "__" ( @@ -459,12 +462,12 @@ cd build2 :batchfile @rem Execute in a separate cmd.exe to preserve the echo mode. @rem -cmd /C bootstrap-clang.bat %cxx% +cmd /C bootstrap-clang.bat %cxx% -m64 -w @if errorlevel 1 goto error @goto endfile :makefile -%make% -f bootstrap.gmake CXX=%cxx% +%make% -f bootstrap.gmake CXX=%cxx% "CXXFLAGS=-m64 -w" @if errorlevel 1 goto error @goto endfile @@ -472,7 +475,7 @@ cmd /C bootstrap-clang.bat %cxx% 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 @@ -489,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^ @@ -572,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%^ @@ -611,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^ |