From cb1be4f493633663bf061b7ea07bd2bf65049546 Mon Sep 17 00:00:00 2001 From: fake Date: Fri, 24 Sep 2004 13:36:03 +0000 Subject: [PATCH] fake: crosstool creation: if we are cross-building, packages scheduled for build after stage 1 make the build system try to chroot. evil. rediff: use ROCKCFG_CROSSBUILD, not crossnative. [2004092117352608669] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4413 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/config/config-200-crosstools.in | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/misc/config/config-200-crosstools.in b/misc/config/config-200-crosstools.in index 0792372aa..221a44669 100644 --- a/misc/config/config-200-crosstools.in +++ b/misc/config/config-200-crosstools.in @@ -31,19 +31,25 @@ menu_begin MENU_CROSSTOOLS 'Cross Toolchain Creation' [ "$crosstarget-unknown-linux-gnu" == "$arch_target" ] && continue ; bool "Build $crosstarget cross toolchain" ROCKCFG_PKG_CROSSTOOL_$crosstarget 0 + if [ "$ROCKCFG_CROSSBUILD" = "0" ] ; then + stages="-----5---9" + else + stages="-1--------" + fi + if [ "$( eval echo \$ROCKCFG_PKG_CROSSTOOL_$crosstarget )" == 1 ] ; then - pkgfork binutils binutils-cross-$crosstarget stages -----5---9 + pkgfork binutils binutils-cross-$crosstarget stages $stages pkgfork linux $ROCKCFG_PKG_LINUX_HEADERS-header-cross-$crosstarget \ - stages -----5---9 + stages $stages if [ "$ROCKCFG_PKG_GLIBC22_USEIT" = 1 ] ; then - pkgfork glibc glibc22-cross-$crosstarget stages -----5---9 + pkgfork glibc glibc22-cross-$crosstarget stages $stages else - pkgfork glibc glibc23-cross-$crosstarget stages -----5---9 + pkgfork glibc glibc23-cross-$crosstarget stages $stages fi - pkgfork gcc $ROCKCFG_DEFAULT_CC-cross-$crosstarget stages -----5---9 + pkgfork gcc $ROCKCFG_DEFAULT_CC-cross-$crosstarget stages $stages fi done menu_end