summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorBob Feng <bob.c.feng@intel.com>2021-02-09 06:58:08 -0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-02-10 01:48:50 +0000
commit124f1dd1ee1140b441151043aacbe5d33bb5ab79 (patch)
tree6d020b438d572acee5c8a591f94c7235ba8b35e7 /BaseTools
parent8cb9b296848e31be33b1b992c2b5c7ea2652600d (diff)
downloadedk2-124f1dd1ee1140b441151043aacbe5d33bb5ab79.tar.gz
edk2-124f1dd1ee1140b441151043aacbe5d33bb5ab79.tar.bz2
edk2-124f1dd1ee1140b441151043aacbe5d33bb5ab79.zip
BaseTools: Fix the ending character for Linux script BuildEnv
Signed-off-by: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Cc: Matthew Carlson <matthewfcarlson@gmail.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Leif Lindholm <leif@nuviainc.com> Reviewed-by: Leif Lindholm <leif@nuviainc.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Diffstat (limited to 'BaseTools')
-rwxr-xr-xBaseTools/BuildEnv24
1 files changed, 12 insertions, 12 deletions
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 8d283e10c0..275f4c5901 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -46,7 +46,7 @@ RestorePreviousConfiguration() {
done
fi
fi
-
+
PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh
if [ -e $PREVIOUS_CONF_FILE ]
then
@@ -198,17 +198,17 @@ AddEdkToolsToPath() {
EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
- # check if the edk2basetools pip package is available
- if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
- # if it is, use the pip version of the wrappers
- echo "Using Pip Basetools"
- AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
- else
- echo "Using EDK2 in-source Basetools"
- AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
- fi
-
-
+ # check if the edk2basetools pip package is available
+ if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
+ # if it is, use the pip version of the wrappers
+ echo "Using Pip Basetools"
+ AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
+ else
+ echo "Using EDK2 in-source Basetools"
+ AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
+ fi
+
+
AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
}