diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-19 10:31:19 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-19 10:37:28 +0200 |
| commit | a6d27c3bca9e9ed591ae4a6e90666a027dcef2b0 (patch) | |
| tree | 5380caf7773f7f827cdcabb3d93fb0a1d1894bf6 /etc | |
| parent | e85f2d4e36ec56229b82f617fb8b9717927347ca (diff) | |
Pass compiler mode as part of config.{c,cxx} in environment scripts
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/environments/default | 6 | ||||
| -rw-r--r-- | etc/environments/default-clang.bat | 8 | ||||
| -rw-r--r-- | etc/environments/default-mingw.bat | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/etc/environments/default b/etc/environments/default index 16e39d1..2155f72 100755 --- a/etc/environments/default +++ b/etc/environments/default @@ -24,10 +24,10 @@ set -e # Exit on errors. mode= case "$1" in x86_64-*) - #mode="config.cc.coptions+=-m64" + #mode=-m64 ;; i?86-*) - mode="config.cc.coptions+=-m32" + mode=-m32 ;; *) echo "unknown target: '$1'" 1>&2 @@ -36,4 +36,4 @@ case "$1" in esac shift -exec "$@" cc config.c="$c" config.cxx="$cxx" $mode +exec "$@" cc config.c="$c $mode" config.cxx="$cxx $mode" diff --git a/etc/environments/default-clang.bat b/etc/environments/default-clang.bat index 78109a9..844372c 100644 --- a/etc/environments/default-clang.bat +++ b/etc/environments/default-clang.bat @@ -43,15 +43,15 @@ set "VCVARS=" set "MODE=" if "_%1_" == "_x86_64-microsoft-win32-msvc%MSVC_VER%_" ( set "VCVARS=%VCVARS64%" - rem set "MODE=config.cc.coptions+=-m64" + rem set "MODE=-m64" ) else ( if "_%1_" == "_i686-microsoft-win32-msvc%MSVC_VER%_" ( set "VCVARS=%VCVARS32%" - set "MODE=config.cc.coptions+=-m32" + set "MODE=-m32" ) else ( if "_%1_" == "_i386-microsoft-win32-msvc%MSVC_VER%_" ( set "VCVARS=%VCVARS32%" - set "MODE=config.cc.coptions+=-m32" + set "MODE=-m32" ) else ( echo error: unknown target %1 goto error @@ -66,7 +66,7 @@ if not "_%MSVC%_" == "__" ( ) ) -%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=%C% config.cxx=%CXX% %MODE% +%2 %3 %4 %5 %6 %7 %8 %9 cc "config.c=%C% %MODE%" "config.cxx=%CXX% %MODE%" if errorlevel 1 goto error goto end diff --git a/etc/environments/default-mingw.bat b/etc/environments/default-mingw.bat index 1d5427b..26d994c 100644 --- a/etc/environments/default-mingw.bat +++ b/etc/environments/default-mingw.bat @@ -26,17 +26,17 @@ rem Based on target determine what we are building. rem set "MODE=" if "_%1_" == "_x86_64-w64-mingw32_" ( - rem set "MODE=config.cc.coptions+=-m64" + rem set "MODE=-m64" ) else ( if "_%1_" == "_i686-w64-mingw32_" ( - set "MODE=config.cc.coptions+=-m32" + set "MODE=-m32" ) else ( echo error: unknown target %1 goto error ) ) -%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=%C% config.cxx=%CXX% %MODE% +%2 %3 %4 %5 %6 %7 %8 %9 cc "config.c=%C% %MODE%" "config.cxx=%CXX% %MODE%" if errorlevel 1 goto error goto end |