summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2017-06-15 17:37:59 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2017-06-15 17:46:04 +0100
commit1c573011dfddbdfc8835031fc79980c394ca7b31 (patch)
tree9b3b384f40777376f05bebd6839e8b3384744ed6
parent65e8e8df04f34fc2a87ae9d34f5ef5b6fee5a396 (diff)
tianocore-build.sh: fixes and improvements for PACKAGES_PATH handling
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
-rwxr-xr-xtianocore-build.sh29
1 files changed, 14 insertions, 15 deletions
diff --git a/tianocore-build.sh b/tianocore-build.sh
index 7f6dc5d..8bee35b 100755
--- a/tianocore-build.sh
+++ b/tianocore-build.sh
@@ -51,24 +51,23 @@ function do_build
PLATFORM_BUILDFLAGS="$PLATFORM_BUILDFLAGS ${EXTRA_OPTIONS[@]}"
PLATFORM_BUILDCMD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $board get -o buildcmd`"
PLATFORM_DSC="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $board get -o dsc`"
- PLATFORM_PACKAGES_PATH="$PACKAGES_PATH"
+ PLATFORM_PACKAGES_PATH=""
COMPONENT_INF="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $board get -o inf`"
TEMP_PACKAGES_PATH="$DEFAULT_PACKAGES_PATH:`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $board get -o packages_path`"
- if [ -n "$TEMP_PACKAGES_PATH" ]; then
- IFS=:
- for path in "$TEMP_PACKAGES_PATH"; do
- case "$path" in
- /*)
- PLATFORM_PACKAGES_PATH="$PLATFORM_PACKAGES_PATH:$path"
- ;;
- *)
- PLATFORM_PACKAGES_PATH="$PLATFORM_PACKAGES_PATH:$PWD/$path"
- ;;
- esac
- done
- unset IFS
- fi
+ IFS=:
+ for path in "$TEMP_PACKAGES_PATH"; do
+ case "$path" in
+ /*)
+ PLATFORM_PACKAGES_PATH="$PLATFORM_PACKAGES_PATH:$path"
+ ;;
+ *)
+ PLATFORM_PACKAGES_PATH="$PLATFORM_PACKAGES_PATH:$PWD/$path"
+ ;;
+ esac
+ done
+ unset IFS
+
if [ $VERBOSE -eq 1 ]; then
echo "Setting build parallellism to $NUM_THREADS processes"
echo "PLATFORM_NAME=$PLATFORM_NAME"