[Minios-devel] [UNIKRAFT PATCH 01/13] build: Adjust sed script to avoid treating arm64 as arm

[Wei Chen <Wei.Chen@xxxxxxx>]

We are using the sed scripts to parse target architecture from
compiler's output. But for arm64, the HOSTARCH and UK_ARCH would
be formatted to arm by mistake. That is because of the order of
sed's scripts:
-e 's/arm64.*/arm64/' -e 's/aarch64.*/arm64/' \
-e 's/arm.*/arm/'
The first line's output "arm64" will be formatted to "arm" by the
second line. So we have to give some reserve characters in second
line to prevent transfer "arm64" to "arm"

Signed-off-by: Wei Chen <Wei.Chen@xxxxxxx>
---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b177bff..801b82f 100644
--- a/Makefile
+++ b/Makefile
@@ -288,13 +288,12 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 
2>&1 | \
                       -e 's/i.86/x86/' \
                       -e 's/sun4u/sparc64/' \
                       -e 's/arm64.*/arm64/' -e 's/aarch64.*/arm64/' \
-                      -e 's/arm.*/arm/' \
+                      -e '/arm64/! s/arm.*/arm/' \
                       -e 's/sa110/arm/' \
                       -e 's/ppc64/powerpc64/' \
                       -e 's/ppc/powerpc/' \
                       -e 's/macppc/powerpc/' \
                       -e 's/sh.*/sh/' )
-
 export HOSTAR HOSTAS HOSTCC HOSTCC_VERSION HOSTCXX HOSTLD HOSTARCH
 export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 
@@ -313,7 +312,7 @@ export UK_ARCH      ?= $(shell echo "$(call 
qstrip,$(ARCH))" | \
                       -e 's/i.86/x86/' \
                       -e 's/sun4u/sparc64/' \
                       -e 's/arm64.*/arm64/' -e 's/aarch64.*/arm64/' \
-                      -e 's/arm.*/arm/' \
+                      -e '/arm64/! s/arm.*/arm/' \
                       -e 's/sa110/arm/' \
                       -e 's/ppc64/powerpc64/' \
                       -e 's/ppc/powerpc/' \
@@ -327,7 +326,7 @@ export UK_ARCH      ?= $(shell echo "$(HOSTARCH)" | \
                       -e 's/i.86/x86/' \
                       -e 's/sun4u/sparc64/' \
                       -e 's/arm64.*/arm64/' -e 's/aarch64.*/arm64/' \
-                      -e 's/arm.*/arm/' \
+                      -e '/arm64/! s/arm.*/arm/' \
                       -e 's/sa110/arm/' \
                       -e 's/ppc64/powerpc64/' \
                       -e 's/ppc/powerpc/' \
-- 
2.7.4


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel