Module Name: src
Committed By: martin
Date: Mon May 25 12:42:26 UTC 2015
Modified Files:
src/compat: archdirs.mk
Log Message:
Fix broken subdir selection after arm architecture explosion
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.8 src/compat/archdirs.mk:1.9
--- src/compat/archdirs.mk:1.8 Fri Sep 19 17:38:46 2014
+++ src/compat/archdirs.mk Mon May 25 12:42:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.8 2014/09/19 17:38:46 matt Exp $
+# $NetBSD: archdirs.mk,v 1.9 2015/05/25 12:42:26 martin Exp $
# list of subdirs used per-platform
@@ -10,16 +10,12 @@ ARCHDIR_SUBDIR= sparc64/sparc
ARCHDIR_SUBDIR= amd64/i386
.endif
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
-ARCHDIR_SUBDIR= arm/eabi
-.endif
-
-.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
-ARCHDIR_SUBDIR= arm/oabi
-.endif
-
-.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
+.if !empty(MACHINE_ARCH:Mearmhf*) || !empty(MACHINE_ARCH:Mearmv?hf*)
ARCHDIR_SUBDIR= arm/oabi arm/eabi
+.elif !empty(MACHINE_ARCH:Mearm*)
+ARCHDIR_SUBDIR= arm/oabi
+.elif !empty(MACHINE_ARCH:Marm)
+ARCHDIR_SUBDIR= arm/eabi
.endif
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
