Upgrade to hv-utilities-0.2.0

[hvlinux.git] / functions / main

diff --git a/functions/main b/functions/main
index 842a8f7..7c167e5 100644 (file)
--- a/functions/main
+++ b/functions/main
@@ -2,8 +2,8 @@
 set -o errtrace # Let shell functions inherit ERR trap.
 set -o errexit
 
-# Don' t locate and remember (hash) commands as they are looked up for
-# execution (don' t remember path):
+# Don't locate and remember (hash) commands as they are looked up for
+# execution (don't remember path):
 set +h
 
 hvtrap_setup()
@@ -102,7 +102,11 @@ if [ -f ../targets/${HVL_TARGET} ]; then
     source ../targets/${HVL_TARGET}
 fi
 
-CLFS_TARGET="${CLFS_ARCH}-${CLFS_OS}-${CLFS_ABI}"
+# When CLFS_OS is defined, define target as the standard triplet:
+CLFS_TARGET="${CLFS_ARCH}"
+if [ x"${CLFS_OS}" != x ]; then
+    CLFS_TARGET+="-${CLFS_OS}-${CLFS_ABI}"
+fi
 
 CLFS_HOST="$(echo $MACHTYPE | \
     sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"