From 749179340193d4fd0985f11dba0333ebac0516ec Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 7 Oct 2020 22:01:39 +0300 Subject: Suppress loading of default options files in build scripts --- build-clang.bat | 6 ++++++ build-mingw.bat | 6 ++++++ build-msvc.bat | 6 ++++++ build.sh | 11 +++++++++++ 4 files changed, 29 insertions(+) diff --git a/build-clang.bat b/build-clang.bat index 16cdae0..172c81c 100644 --- a/build-clang.bat +++ b/build-clang.bat @@ -210,6 +210,12 @@ rem %cxx% --version @if errorlevel 1 goto error +@rem Suppress loading of default options files. +@rem +set "BUILD2_DEF_OPT=0" +set "BPKG_DEF_OPT=0" +set "BDEP_DEF_OPT=0" + @rem Bootstrap. @rem cd build2 diff --git a/build-mingw.bat b/build-mingw.bat index 21704b4..067d517 100644 --- a/build-mingw.bat +++ b/build-mingw.bat @@ -219,6 +219,12 @@ rem %cxx% --version @if errorlevel 1 goto error +@rem Suppress loading of default options files. +@rem +set "BUILD2_DEF_OPT=0" +set "BPKG_DEF_OPT=0" +set "BDEP_DEF_OPT=0" + @rem Bootstrap. @rem cd build2 diff --git a/build-msvc.bat b/build-msvc.bat index e9416a3..1060e25 100644 --- a/build-msvc.bat +++ b/build-msvc.bat @@ -199,6 +199,12 @@ rem %cxx% @if errorlevel 1 goto error +@rem Suppress loading of default options files. +@rem +set "BUILD2_DEF_OPT=0" +set "BPKG_DEF_OPT=0" +set "BDEP_DEF_OPT=0" + @rem Bootstrap. @rem cd build2 diff --git a/build.sh b/build.sh index a1ba1cf..58d944a 100755 --- a/build.sh +++ b/build.sh @@ -326,6 +326,17 @@ if test -n "$verbose"; then verbose="--verbose $verbose" fi +# Suppress loading of default options files. +# +BUILD2_DEF_OPT="0" +export BUILD2_DEF_OPT + +BPKG_DEF_OPT="0" +export BPKG_DEF_OPT + +BDEP_DEF_OPT="0" +export BDEP_DEF_OPT + # Bootstrap, stage 1. # run cd build2 -- cgit v1.1