| 1 |
commit: c7a42f71ba83ce97eeae0ed50b0ab334f667c720 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 02:13:36 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 02:21:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a42f71 |
| 7 |
|
| 8 |
dev-util/mingw64-runtime: add bypass option for unset |
| 9 |
|
| 10 |
Unset is needed given CC is not expected to be a cross-compiler |
| 11 |
but, if users know what they are doing, leave a way (MINGW_BYPASS=1). |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild | 2 +- |
| 16 |
dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild | 2 +- |
| 17 |
dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild | 2 +- |
| 18 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index d082ba67bbc6..76ea7da69341 100644 |
| 22 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild |
| 23 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild |
| 24 |
@@ -58,7 +58,7 @@ src_configure() { |
| 25 |
MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it |
| 26 |
|
| 27 |
# likely cross-compiling from here, update toolchain variables |
| 28 |
- ${MW_CROSS} && |
| 29 |
+ ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] && |
| 30 |
unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP |
| 31 |
local CHOST=${CTARGET} |
| 32 |
strip-unsupported-flags |
| 33 |
|
| 34 |
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 |
| 35 |
index 7eaca692a9d3..faedf8c7e909 100644 |
| 36 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild |
| 37 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild |
| 38 |
@@ -60,7 +60,7 @@ src_configure() { |
| 39 |
MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it |
| 40 |
|
| 41 |
# likely cross-compiling from here, update toolchain variables |
| 42 |
- ${MW_CROSS} && |
| 43 |
+ ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] && |
| 44 |
unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP |
| 45 |
local CHOST=${CTARGET} |
| 46 |
strip-unsupported-flags |
| 47 |
|
| 48 |
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 |
| 49 |
index d082ba67bbc6..76ea7da69341 100644 |
| 50 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild |
| 51 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild |
| 52 |
@@ -58,7 +58,7 @@ src_configure() { |
| 53 |
MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it |
| 54 |
|
| 55 |
# likely cross-compiling from here, update toolchain variables |
| 56 |
- ${MW_CROSS} && |
| 57 |
+ ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] && |
| 58 |
unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP |
| 59 |
local CHOST=${CTARGET} |
| 60 |
strip-unsupported-flags |
Archives