diff options
| author |   Daniel Robbins <drobbins@gentoo.org> | 2001-08-24 05:55:43 +0000 |
|---|---|---|
| committer | Daniel Robbins <drobbins@gentoo.org> | 2001-08-24 05:55:43 +0000 |
| commit | 943529705586e9a01abc768a7c92a2fa0499ce7d (patch) | |
| tree | 2554798669344aff76d66dfad3a157e01541a22d /scripts | |
| parent | bootstrap.sh fixups :) (diff) | |
| download | gentoo-2-943529705586e9a01abc768a7c92a2fa0499ce7d.tar.gz gentoo-2-943529705586e9a01abc768a7c92a2fa0499ce7d.tar.bz2 gentoo-2-943529705586e9a01abc768a7c92a2fa0499ce7d.zip | |
more bootstrap fixes
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 512020fa4fb5..9d14e0d82d34 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -15,7 +15,13 @@ echo "Using GETTEXT $myGETTEXT" echo "Using GLIBC $myGLIBC" #USE may be set from the environment (recommended) so we back it up for later. -olduse="$USE" +if [ "${USE-UNSET}" = "UNSET" ] +then + unset=yes +else + olduse="$USE" + unset=no +fi export USE="build" export CONFIG_PROTECT="" #above allows portage to overwrite stuff @@ -24,7 +30,12 @@ emerge $myPORTAGE || exit emerge $myGETTEXT || exit emerge $myBINUTILS || exit emerge $myGCC || exit -export USE="$olduse" +if [ "$unset" = "yes" ] +then + unset USE +else + export USE="$olduse" +fi export USE="`spython -c 'import portage; print portage.settings["USE"];'` bootstrap" emerge $myGLIBC || exit emerge $myGETTEXT || exit |