summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-04-03 23:23:09 +0000
committerbapt <bapt@FreeBSD.org>2015-04-03 23:23:09 +0000
commitef3b6ff94c6609e7710d581613d59bcfb79a9d60 (patch)
treeac49a30b30ce969c4772b13c1717e8d6501cb8fc /Makefile
parentd6ca866646a4418a704431c22c6cae618582f79c (diff)
parentb9992ffd9068115a674364943eeaf406b4d1565f (diff)
downloadFreeBSD-src-ef3b6ff94c6609e7710d581613d59bcfb79a9d60.zip
FreeBSD-src-ef3b6ff94c6609e7710d581613d59bcfb79a9d60.tar.gz
Merge from HEAD
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 671bda5..d952d99 100644
--- a/Makefile
+++ b/Makefile
@@ -166,10 +166,10 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=$
# Guess machine architecture from machine type, and vice versa.
.if !defined(TARGET_ARCH) && defined(TARGET)
-_TARGET_ARCH= ${TARGET:S/pc98/i386/}
+_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/}
.elif !defined(TARGET) && defined(TARGET_ARCH) && \
${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/}
+_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/}
.endif
.if defined(TARGET) && !defined(_TARGET)
_TARGET=${TARGET}
OpenPOWER on IntegriCloud