From f9048ed23d68c3a36060acd50c73c80d759c5a3f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 17 Jul 2017 20:24:30 +0200 Subject: Require target in environment scripts --- etc/environments/default-mingw.bat | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'etc/environments/default-mingw.bat') diff --git a/etc/environments/default-mingw.bat b/etc/environments/default-mingw.bat index 3d9bcb1..0491882 100644 --- a/etc/environments/default-mingw.bat +++ b/etc/environments/default-mingw.bat @@ -7,6 +7,9 @@ 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 rem %1 - target rem %2 - bbot executable @@ -20,16 +23,18 @@ set "PATH=$MINGW;%PATH%" rem Based on target determine what we are building. rem -rem Note that an empty argument is passed as "" (literal quotes). -rem -if _%1_ == _""_ ( - rem +if "_%1_" == "_x86_64-w64-mingw32_" ( + set "mode=" ) else ( - echo error: unknown target %1 - goto error + if "_%1_" == "_i686-w64-mingw32_" ( + 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++ +%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=gcc config.cxx=g++ %mode% if errorlevel 1 goto error goto end -- cgit v1.1