aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-11-08 13:25:05 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-11-08 13:25:05 +0000
commitf952e6bd7030033b2e4a3c8b9d62accb91e8e354 (patch)
tree84404c895b0d9dd426cca4144755d3e4d541ab9e
parentcrossdev: drop debug output (diff)
downloadcrossdev-f952e6bd7030033b2e4a3c8b9d62accb91e8e354.tar.gz
crossdev-f952e6bd7030033b2e4a3c8b9d62accb91e8e354.tar.bz2
crossdev-f952e6bd7030033b2e4a3c8b9d62accb91e8e354.zip
crossdev: disable USE=libraries for stage1 install
Reported-by: Paul Bordukov Bug: https://bugs.gentoo.org/751295 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rwxr-xr-xcrossdev9
1 files changed, 6 insertions, 3 deletions
diff --git a/crossdev b/crossdev
index 870b7c7..5399925 100755
--- a/crossdev
+++ b/crossdev
@@ -771,10 +771,13 @@ AUTOGEN_TAG="# Autogenerated and managed by crossdev"
# These flags are always disabled for cross-gcc; either usually/always broken, or
# not tested, or doesn't make sense, or no one simply cares about them
GUSE_DISABLE="-boundschecking -d -gcj -gtk -libffi -mudflap -objc -objc++ -objc-gc"
-# These are disabled only for stage1 gcc. Normally need libc present.
+# These are disabled only for stage1 gcc. Normally need libc presence.
GUSE_DISABLE_STAGE_1="${GUSE_DISABLE} -fortran -go -jit -cxx -mpx -openmp -sanitize -vtv"
GUSE_DISABLE_STAGE_2="${GUSE_DISABLE}"
+# mingw64-runtime needs a stage2 compiler to build libraries: https://bugs.gentoo.org/751295
+LUSE_DISABLE="-libraries"
+
# Past history of WITH_DEF_HEADERS:
# - ????-2005: "no"
# - 2005-2019: "yes": #227065 gcc-4.3+ is a pita w/out headers
@@ -1485,7 +1488,7 @@ if ! ex_fast ; then
# we have to use --nodeps as glibc itself might have
# a dependency on newer gcc versions that we don't
# care about at this point -- we aren't compiling yet
- USE="${LUSE} ${USE} headers-only" \
+ USE="${LUSE} ${USE} ${LUSE_DISABLE} headers-only" \
CROSSCOMPILE_OPTS="headers-only" \
EOPTS="${EOPTS} --nodeps" \
doemerge ${LPKG} ${LPKG}-headers
@@ -1513,7 +1516,7 @@ if ! ex_fast ; then
set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only headers-only
- USE="${LUSE} ${USE}" \
+ USE="${LUSE} ${USE} ${LUSE_DISABLE}" \
CROSSCOMPILE_OPTS="" \
doemerge ${LPKG}
fi