diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-04-10 07:18:20 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-04-10 07:18:20 +0000 |
| commit | 64b2609fcff9d6412eea4c74c8e74bed33dc3235 (patch) | |
| tree | b2fa2c1493272b91a04ff4f12384f3ceaa23f1a7 /BaseTools/BuildEnv | |
| parent | 09e4dbeb5c0ef7d9e178e81f73c9e43f8ef48559 (diff) | |
| download | edk2-platforms-64b2609fcff9d6412eea4c74c8e74bed33dc3235.tar.xz | |
Sync BaseTools Trunk (version r2518) to EDKII main trunk.
Signed-off-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13178 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/BuildEnv')
| -rwxr-xr-x | BaseTools/BuildEnv | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index ca8a5781f6..79f916a9d5 100755 --- a/BaseTools/BuildEnv +++ b/BaseTools/BuildEnv @@ -1,5 +1,5 @@ # -# Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> # 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 @@ -160,6 +160,14 @@ GetEdkToolsPathBinDirectory() { echo $EDK_TOOLS_PATH_BIN } +AddDirToStartOfPath() { + DIRNAME=$1 + PATH=$DIRNAME:$DIRNAME:$DIRNAME:$PATH + PATH=${PATH//$DIRNAME:/} + PATH=$DIRNAME:$PATH + export PATH +} + AddEdkToolsToPath() { # @@ -172,18 +180,8 @@ AddEdkToolsToPath() { EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` - if [ ! -e $EDK_TOOLS_PATH_BIN ] - then - echo "Unable to find expected bin path under \$EDK_TOOLS_PATH!" - echo "> $EDK_TOOLS_PATH_BIN" - return 1 - fi - - if [ "${PATH/$EDK_TOOLS_PATH_BIN/}" == "$PATH" ] - then - export PATH=$EDK_TOOLS_PATH_BIN:$PATH - return 0 - fi + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike + AddDirToStartOfPath $EDK_TOOLS_PATH_BIN } @@ -208,7 +206,6 @@ CopySingleTemplateFile() { CopyTemplateFiles() { CopySingleTemplateFile build_rule - CopySingleTemplateFile FrameworkDatabase CopySingleTemplateFile tools_def CopySingleTemplateFile target |