aboutsummaryrefslogtreecommitdiff
path: root/etc/environments/default-mingw.bat
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-10-07 16:53:00 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-10-08 11:23:52 +0200
commit084b18928556640b396d8788145539f5cbd2dbff (patch)
tree9fdff81898de125b13fd11be29c2e4c474258784 /etc/environments/default-mingw.bat
parent3e888ccbc044f1b87140db8c8523d793fc7f6481 (diff)
Don't assume which mode (-m32/-m64, etc) is required in environment setup
Diffstat (limited to 'etc/environments/default-mingw.bat')
-rw-r--r--etc/environments/default-mingw.bat16
1 files changed, 9 insertions, 7 deletions
diff --git a/etc/environments/default-mingw.bat b/etc/environments/default-mingw.bat
index 01e46ab..1d5427b 100644
--- a/etc/environments/default-mingw.bat
+++ b/etc/environments/default-mingw.bat
@@ -7,9 +7,12 @@ rem license : TBC; see accompanying LICENSE file
rem
rem Environment setup script for C/C++ compilation with MinGW GCC.
rem
-rem Note that we assume the compiler's default target is x86_64-w64-mingw32
-rem and, if requested, i686-w64-mingw32 can be selected with -m32.
+
+rem NOTE: don't forget to adjust the target mode selection below.
rem
+set "C=gcc"
+set "CXX=g++"
+set "MINGW=C:\build2\bin"
rem %1 - target
rem %2 - bbot executable
@@ -17,24 +20,23 @@ rem %3+ - bbot options
setlocal EnableExtensions EnableDelayedExpansion
-set "MINGW=C:\build2\bin"
-
set "PATH=$MINGW;%PATH%"
rem Based on target determine what we are building.
rem
+set "MODE="
if "_%1_" == "_x86_64-w64-mingw32_" (
- set "mode="
+ rem set "MODE=config.cc.coptions+=-m64"
) else (
if "_%1_" == "_i686-w64-mingw32_" (
- set "mode=config.cc.coptions+=-m32"
+ set "MODE=config.cc.coptions+=-m32"
) else (
echo error: unknown target %1
goto error
)
)
-%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=gcc config.cxx=g++ %mode%
+%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=%C% config.cxx=%CXX% %MODE%
if errorlevel 1 goto error
goto end