diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-12-21 11:25:36 +0000 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-12-21 17:49:17 +0000 |
| commit | 50f2431eb57a6acc3f776e9ef7c18b4dc6d57e2e (patch) | |
| tree | 4ac416e33cb53535809a2fb7bf7d88026a37ba9e | |
| parent | 164d23902b6dae0932459e25c2650fe047b9c962 (diff) | |
| download | definitions-50f2431eb57a6acc3f776e9ef7c18b4dc6d57e2e.tar.gz | |
Use MORPH_ARCH instead manual parsing
Change-Id: I10f5794157941c828db8d3acbc386dffbacd1831
| -rw-r--r-- | strata/build-essential/stage2-glibc.morph | 3 | ||||
| -rw-r--r-- | strata/icu-common/icu.morph | 3 | ||||
| -rw-r--r-- | 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= ;; |