scripts: fix regression on reuse of shell environment variables

[AGL/meta-agl.git] / scripts / envsetup.sh

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index b30e0a6..6ca10de 100644 (file)
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -77,6 +77,11 @@ else
   BUILD_DIR=build
 fi
 
+echo "envsetup: Setup build environment for poky/oe."
+echo -e
+
+source poky/oe-init-build-env $BUILD_DIR
+
 if [ -n "$DL_DIR" ]; then
         BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 fi
@@ -87,9 +92,4 @@ fi
 
 export BB_ENV_EXTRAWHITE
 
-echo "envsetup: Setup build environment for poky/oe."
-echo -e
-
-source poky/oe-init-build-env $BUILD_DIR
-
 unset TEMPLATECONF