Clean up builds on "sh" to use the right ARCH dirs

1 files changed, 18 insertions, 6 deletions

diff --git a/Rules.mak b/Rules.mak
index 2093d4285..68beb93b5 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -36,13 +36,25 @@ LIBC=$(TOPDIR)libc/libc.a
 
 BUILDTIME = ${shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z"}
 GCCINCDIR = ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
-NATIVE_ARCH = ${shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
-		-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/ppc/powerpc/g' \
-		-e 's/v850.*/v850/g'}
+NATIVE_ARCH = ${shell uname -m | sed \
+		-e 's/i.86/i386/' \
+		-e 's/sparc.*/sparc/' \
+		-e 's/arm.*/arm/g' \
+		-e 's/m68k.*/m68k/' \
+		-e 's/ppc/powerpc/g' \
+		-e 's/v850.*/v850/g' \
+		-e 's/sh[234]/sh/' \
+		}
 ifeq ($(strip $(TARGET_ARCH)),)
-TARGET_ARCH=${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
-		-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/ppc/powerpc/g' \
-		-e 's/v850.*/v850/g'}
+TARGET_ARCH=${shell $(CC) -dumpmachine | sed -e s'/-.*//' \
+		-e 's/i.86/i386/' \
+		-e 's/sparc.*/sparc/' \
+		-e 's/arm.*/arm/g' \
+		-e 's/m68k.*/m68k/' \
+		-e 's/ppc/powerpc/g' \
+		-e 's/v850.*/v850/g' \
+		-e 's/sh[234]/sh/' \
+		}
 endif
 
 # Some nice architecture specific optimizations