diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-09-02 13:15:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-02 13:15:10 -0700 |
| commit | fcf9d2ff4f7bfa47cba7df48e3cc49f3e817d7ce (patch) | |
| tree | 09b6cb370b8e99b67592f43a223f0fb815bce878 /bin | |
| parent | Prevent the local filter_opts variable in filter_readonly_variables() (diff) | |
| download | portage-fcf9d2ff4f7bfa47cba7df48e3cc49f3e817d7ce.tar.gz portage-fcf9d2ff4f7bfa47cba7df48e3cc49f3e817d7ce.tar.bz2 portage-fcf9d2ff4f7bfa47cba7df48e3cc49f3e817d7ce.zip | |
Prevent local x variable in ebuild_main() from showing up in
environment.bz2.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 5177494f9..f17e63b3e 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -2104,8 +2104,6 @@ ebuild_main() { export EBUILD_MASTER_PID=$BASHPID trap 'exit 1' SIGTERM - local f x - if [[ $EBUILD_PHASE != depend ]] ; then # Force configure scripts that automatically detect ccache to # respect FEATURES="-ccache". @@ -2155,10 +2153,12 @@ ebuild_main() { case "$EBUILD_SH_ARGS" in configure|compile) + local x for x in ASFLAGS CCACHE_DIR CCACHE_SIZE \ CFLAGS CXXFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS ; do [[ ${!x+set} = set ]] && export $x done + unset x hasq distcc $FEATURES && [[ -n $DISTCC_DIR ]] && \ [[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \ |