summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-10-11 15:58:07 -0300
committerRenato Botelho <renato@netgate.com>2016-10-11 15:58:07 -0300
commit3154be54107e227f50385a535df84af2af4dee61 (patch)
treebf64aeeeab32fbc8a41687a415ceb23b117d65f5
parent2ac4be3a6b52a266a571fda10456fd350c1d20d0 (diff)
downloadpfsense-3154be54107e227f50385a535df84af2af4dee61.zip
pfsense-3154be54107e227f50385a535df84af2af4dee61.tar.gz
Simplify TARGET and TARGET_ARCH initialization
-rw-r--r--tools/builder_defaults.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 501b5b1..159dc52 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -55,12 +55,8 @@ fi
export ASSUME_ALWAYS_YES=true
# Architecture
-export TARGET=${TARGET:-"`uname -m`"}
-export TARGET_ARCH=${TARGET_ARCH:-${TARGET}}
-# Set TARGET_ARCH_CONF_DIR
-if [ "$TARGET_ARCH" = "" ]; then
- export TARGET_ARCH=`uname -p`
-fi
+export TARGET=${TARGET:-"$(uname -m)"}
+export TARGET_ARCH=${TARGET_ARCH:-"$(uname -p)"}
# Directory to be used for writing temporary information
export SCRATCHDIR=${SCRATCHDIR:-"${BUILDER_ROOT}/tmp"}
OpenPOWER on IntegriCloud