Change multilib functions to set the variable.

Rather than echo-ing the new value, set the value into the variable with
the name passed as an argument (similar to CT_SanitizeVarDir). This
allows to use CT_DoLog in these functions.

Signed-off-by: Alexey Neyman <stilor@att.net>

1 files changed, 17 insertions, 14 deletions

diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh
index 964dd25..8015724 100644
--- a/scripts/build/arch/powerpc.sh
+++ b/scripts/build/arch/powerpc.sh
@@ -29,11 +29,12 @@ CT_DoArchTupleValues () {
 
 #------------------------------------------------------------------------------
 # Get multilib architecture-specific target
-# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
+# Usage: CT_DoArchMultilibTarget "target variable" "multilib flags"
 CT_DoArchMultilibTarget ()
 {
-    local target="${1}"; shift
+    local target_var="${1}"; shift
     local -a multi_flags=( "$@" )
+    local target_
 
     local m32=false
     local m64=false
@@ -49,22 +50,24 @@ CT_DoArchMultilibTarget ()
         esac
     done
 
+    eval target_=\"\${${target_var}}\"
+
     # Fix up bitness
-    case "${target}" in
-        powerpc-*)      $m64 && target=${target/#powerpc-/powerpc64-} ;;
-        powerpcle-*)    $m64 && target=${target/#powerpcle-/powerpc64le-} ;;
-        powerpc64-*)    $m32 && target=${target/#powerpc64-/powerpc-} ;;
-        powerpc64le-*)  $m32 && target=${target/#powerpc64le-/powerpcle-} ;;
+    case "${target_}" in
+        powerpc-*)      $m64 && target_=${target_/#powerpc-/powerpc64-} ;;
+        powerpcle-*)    $m64 && target_=${target_/#powerpcle-/powerpc64le-} ;;
+        powerpc64-*)    $m32 && target_=${target_/#powerpc64-/powerpc-} ;;
+        powerpc64le-*)  $m32 && target_=${target_/#powerpc64le-/powerpcle-} ;;
     esac
 
     # Fix up endianness
-    case "${target}" in
-        powerpc-*)      $mlittle && target=${target/#powerpc-/powerpcle-} ;;
-        powerpcle-*)    $mbig && target=${target/#powerpcle-/powerpc-} ;;
-        powerpc64-*)    $mlittle && target=${target/#powerpc64-/powerpc64le-} ;;
-        powerpc64le-*)  $mbig && target=${target/#powerpc64le-/powerpc64-} ;;
+    case "${target_}" in
+        powerpc-*)      $mlittle && target_=${target_/#powerpc-/powerpcle-} ;;
+        powerpcle-*)    $mbig && target_=${target_/#powerpcle-/powerpc-} ;;
+        powerpc64-*)    $mlittle && target_=${target_/#powerpc64-/powerpc64le-} ;;
+        powerpc64le-*)  $mbig && target_=${target_/#powerpc64le-/powerpc64-} ;;
     esac
 
-    # return the target
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }