[gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/

[Ionen Wolkens]

commit:     c7a42f71ba83ce97eeae0ed50b0ab334f667c720
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 02:13:36 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat May 14 02:21:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a42f71

dev-util/mingw64-runtime: add bypass option for unset

Unset is needed given CC is not expected to be a cross-compiler
but, if users know what they are doing, leave a way (MINGW_BYPASS=1).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild | 2 +-
 dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild  | 2 +-
 dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild 
b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index d082ba67bbc6..76ea7da69341 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -58,7 +58,7 @@ src_configure() {
        MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
 
        # likely cross-compiling from here, update toolchain variables
-       ${MW_CROSS} &&
+       ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] &&
                unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
        local CHOST=${CTARGET}
        strip-unsupported-flags

diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild 
b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
index 7eaca692a9d3..faedf8c7e909 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
@@ -60,7 +60,7 @@ src_configure() {
        MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
 
        # likely cross-compiling from here, update toolchain variables
-       ${MW_CROSS} &&
+       ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] &&
                unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
        local CHOST=${CTARGET}
        strip-unsupported-flags

diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild 
b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
index d082ba67bbc6..76ea7da69341 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
@@ -58,7 +58,7 @@ src_configure() {
        MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
 
        # likely cross-compiling from here, update toolchain variables
-       ${MW_CROSS} &&
+       ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] &&
                unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
        local CHOST=${CTARGET}
        strip-unsupported-flags