aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcrossdev17
1 files changed, 10 insertions, 7 deletions
diff --git a/crossdev b/crossdev
index 2df6657..a19cf1f 100755
--- a/crossdev
+++ b/crossdev
@@ -155,7 +155,7 @@ parse_target() {
# due to upstream lameness, build C/C++ at first glance
*-cygwin)
- GUSE_DISABLE=${GUSE_DISABLE/nocxx};;
+ GUSE_DISABLE_STAGE_1=${GUSE_DISABLE_STAGE_1/nocxx};;
# these are the mingw64 targets that binutils seems to use
x86_64-*-mingw*|*-w64-mingw*)
@@ -192,11 +192,11 @@ parse_target() {
KPKG="[none]"
GVER="3.2.2"; BVER="2.14";
STAGE_DEFAULT=${STAGE_C_ONLY};
- GUSE=${GUSE_DISABLE};;
+ GUSE=${GUSE_DISABLE_STAGE_1};;
iop*) TARCH=mips;
GVER="3.2.2"; BVER="2.14";
STAGE_DEFAULT=${STAGE_C_ONLY};
- GUSE=${GUSE_DISABLE};;
+ GUSE=${GUSE_DISABLE_STAGE_1};;
dvp*) TARCH=mips;
GVER="3.2.2"; BVER="2.14";
STAGE_DEFAULT=${STAGE_BINUTILS};;
@@ -362,9 +362,12 @@ GCAT="sys-devel" ; GPKG="gcc" ; GVER="" ; GUSE=""
KCAT="sys-kernel" ; KPKG="linux-headers" ; KVER="" ; KUSE=""
LCAT="sys-libs" ; LPKG="" ; LVER="" ; LUSE=""
DEFAULT_VER="[latest]"
-GUSE_DISABLE="-boundschecking -d -fortran -gtk -gcj -libffi -mudflap nocxx -objc -objc++ -objc-gc -openmp"
-GUSE_DISABLE_STAGE_2=${GUSE_DISABLE/-fortran}
-GUSE_DISABLE_STAGE_2=${GUSE_DISABLE_STAGE_2/nocxx}
+# 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 -gtk -gcj -libffi -mudflap -objc -objc++ -objc-gc"
+# These are disabled only for stage1 gcc
+GUSE_DISABLE_STAGE_1="${GUSE_DISABLE} -fortran nocxx -openmp"
+GUSE_DISABLE_STAGE_2="${GUSE_DISABLE}"
WITH_HEADERS="COW" WITH_DEF_HEADERS="yes" #227065 gcc-4.3+ is a pita w/out headers
EX_FAST="no"
EX_GCC="no"
@@ -696,7 +699,7 @@ USE="${KUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
doemerge ${LPKG} ${LPKG}-headers
fi
-USE="${GUSE} ${USE} ${GUSE_DISABLE}" CROSSCOMPILE_OPTS="bootstrap" \
+USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_1}" CROSSCOMPILE_OPTS="bootstrap" \
doemerge ${GPKG} ${GPKG}-stage1
is_s2 || exit 0