From 3154be54107e227f50385a535df84af2af4dee61 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 11 Oct 2016 15:58:07 -0300
Subject: Simplify TARGET and TARGET_ARCH initialization

---
 tools/builder_defaults.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'tools/builder_defaults.sh')

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"}
-- 
cgit v1.1