X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FBuildEnv;h=ff0c5115a5e18a074705bbd58c273ab2dd98066b;hb=08283b966ea10c0430140dc2b2951d8534d05aaa;hp=7c77454bf88bdf106a720400a64f1c8446115a09;hpb=094a67398f2e84fb11955ae8f8588647f9bd67cc;p=mirror_edk2.git
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 7c77454bf8..ff0c5115a5 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -2,7 +2,8 @@
# Setup the environment for unix-like systems running a bash-like shell.
# This file must be "sourced" not merely executed. For example: ". edksetup.sh"
#
-# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -40,8 +41,8 @@ RestorePreviousConfiguration() {
export CONF_PATH=$WORKSPACE/Conf
if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
then
- PACKAGES_PATH=${PACKAGES_PATH//:/ }
- for DIR in $PACKAGES_PATH
+ PATH_LIST=${PACKAGES_PATH//:/ }
+ for DIR in $PATH_LIST
do
if [ -d $DIR/Conf ]
then
@@ -89,7 +90,7 @@ StoreCurrentConfiguration() {
#
OUTPUT_FILE=$CONF_PATH/BuildEnv.sh
#echo Storing current configuration into $OUTPUT_FILE
- echo "# Auto-generated by ${BASH_SOURCE[0]}" > $OUTPUT_FILE
+ echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
GenerateShellCodeToUpdatePath $OUTPUT_FILE
@@ -137,8 +138,8 @@ SetEdkToolsPath() {
#
if [ -n "$PACKAGES_PATH"]
then
- PACKAGES_PATH=${PACKAGES_PATH//:/ }
- for DIR in $PACKAGES_PATH
+ PATH_LIST=${PACKAGES_PATH//:/ }
+ for DIR in $PATH_LIST
do
if [ -d $DIR/BaseTools ]
then
@@ -215,7 +216,7 @@ CopySingleTemplateFile() {
if [ -e $DST_FILENAME ]
then
- return
+ [ $RECONFIG != TRUE ] && return
fi
echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"