From 50f2431eb57a6acc3f776e9ef7c18b4dc6d57e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 21 Dec 2015 11:25:36 +0000
Subject: Use MORPH_ARCH instead manual parsing

Change-Id: I10f5794157941c828db8d3acbc386dffbacd1831
---
 strata/build-essential/stage2-glibc.morph | 3 +--
 strata/icu-common/icu.morph               | 3 +--
 strata/swift/gf-complete.morph            | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index f44d0ebb..45f22db5 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -85,8 +85,7 @@ install-commands:
 # sysdeps/unix/sysv/linux/configure.
 - install -d $DESTDIR/lib
 - |
-  cpu=$(echo $TARGET | cut -d '-' -f 1)
-  case "$cpu" in
+  case "$MORPH_ARCH" in
   x86_64)
     install -d "$DESTDIR/lib64"
     ln -s "$PREFIX/lib/ld-linux-x86-64.so.2" \
diff --git a/strata/icu-common/icu.morph b/strata/icu-common/icu.morph
index 42a7bc58..5c269ee0 100644
--- a/strata/icu-common/icu.morph
+++ b/strata/icu-common/icu.morph
@@ -4,8 +4,7 @@ configure-commands:
 - |
   # As per commit 8874a7c7, We issue this sed command when
   # building ICU libraries on arm architectures.
-  cpu=$(echo $TARGET | cut -d '-' -f 1)
-  case "$cpu" in
+  case "$MORPH_ARCH" in
   *arm*)
     sed -e 's/LDFLAGSICUDT/#LDFLAGSICUDT/' -i source/config/mh-linux
     ;;
diff --git a/strata/swift/gf-complete.morph b/strata/swift/gf-complete.morph
index e8965c76..adbe5a48 100644
--- a/strata/swift/gf-complete.morph
+++ b/strata/swift/gf-complete.morph
@@ -5,8 +5,7 @@ pre-configure-commands:
 - ./autogen.sh
 configure-commands:
 - |
-  cpu="$(echo $TARGET | cut -d '-' -f 1)"
-  case "$cpu" in
+  case "$MORPH_ARCH" in
   x86_64)
     SSE=
     ;;
-- 
cgit v1.2.1