Author: bdrewery
Date: Thu Jun 28 22:24:16 2018
New Revision: 335788
URL: https://svnweb.freebsd.org/changeset/base/335788
Log:
Fix unknown target check after r335450.
X-MFC-with: r335450
Pointyhat to: bdrewery
Sponsored by: Dell EMC
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Jun 28 22:13:32 2018 (r335787)
+++ head/Makefile.inc1 Thu Jun 28 22:24:16 2018 (r335788)
@@ -129,7 +129,41 @@ MACHINE_ABI?= unknown
MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.0
TARGET_ABI?= unknown
TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.0
+KNOWN_ARCHES?= aarch64/arm64 \
+ amd64 \
+ arm \
+ armeb/arm \
+ armv6/arm \
+ armv7/arm \
+ i386 \
+ mips \
+ mipsel/mips \
+ mips64el/mips \
+ mipsn32el/mips \
+ mips64/mips \
+ mipsn32/mips \
+ mipshf/mips \
+ mipselhf/mips \
+ mips64elhf/mips \
+ mips64hf/mips \
+ powerpc \
+ powerpc64/powerpc \
+ powerpcspe/powerpc \
+ riscv64/riscv \
+ riscv64sf/riscv \
+ sparc64
+.if ${TARGET} == ${TARGET_ARCH}
+_t= ${TARGET}
+.else
+_t= ${TARGET_ARCH}/${TARGET}
+.endif
+.for _t in ${_t}
+.if empty(KNOWN_ARCHES:M${_t})
+.error Unknown target ${TARGET_ARCH}:${TARGET}.
+.endif
+.endfor
+
# If all targets are disabled for system llvm then don't expect it to work
# for cross-builds.
.if !defined(TOOLS_PREFIX) && ${MK_LLVM_TARGET_ALL} == "no" && \
@@ -524,41 +558,6 @@ EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/}
PKG_VERSION= ${_REVISION}${EXTRA_REVISION}
.endif
.endif # !defined(_MKSHOWCONFIG)
-
-KNOWN_ARCHES?= aarch64/arm64 \
- amd64 \
- arm \
- armeb/arm \
- armv6/arm \
- armv7/arm \
- i386 \
- mips \
- mipsel/mips \
- mips64el/mips \
- mipsn32el/mips \
- mips64/mips \
- mipsn32/mips \
- mipshf/mips \
- mipselhf/mips \
- mips64elhf/mips \
- mips64hf/mips \
- powerpc \
- powerpc64/powerpc \
- powerpcspe/powerpc \
- riscv64/riscv \
- riscv64sf/riscv \
- sparc64
-
-.if ${TARGET} == ${TARGET_ARCH}
-_t= ${TARGET}
-.else
-_t= ${TARGET_ARCH}/${TARGET}
-.endif
-.for _t in ${_t}
-.if empty(KNOWN_ARCHES:M${_t})
-.error Unknown target ${TARGET_ARCH}:${TARGET}.
-.endif
-.endfor
.if !defined(_MKSHOWCONFIG)
_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
