Revert previous. trunk
authornakayama <nakayama@NetBSD.org>
Fri, 17 May 2019 13:44:55 +0000
branchtrunk
changeset 451355 4616dfe9cd38
parent 451354 264188ae84d3
child 451356 e1848b76433b
Revert previous. The binaries created are different, but according to joerg@ there is no difference in functionality.
share/mk/bsd.own.mk
tools/llvm-clang-tblgen/Makefile
tools/llvm-tblgen/Makefile
--- a/share/mk/bsd.own.mk	Fri May 17 08:56:12 2019 +0000
+++ b/share/mk/bsd.own.mk	Fri May 17 13:44:55 2019 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1135 2019/05/16 20:00:49 nakayama Exp $
+#	$NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -365,7 +365,7 @@
 TOOL_CAP_MKDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
 TOOL_CAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}cat
 TOOL_CKSUM=		${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
-TOOL_CLANG_TBLGEN=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang-tblgen
+TOOL_CLANG_TBLGEN=	${TOOLDIR}/bin/${_TOOL_PREFIX}clang-tblgen
 TOOL_COMPILE_ET=	${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
 TOOL_CONFIG=		${TOOLDIR}/bin/${_TOOL_PREFIX}config
 TOOL_CRUNCHGEN=		MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
@@ -399,7 +399,7 @@
 TOOL_INSTALLBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
 TOOL_INSTALL_INFO=	${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
 TOOL_JOIN=		${TOOLDIR}/bin/${_TOOL_PREFIX}join
-TOOL_LLVM_TBLGEN=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-llvm-tblgen
+TOOL_LLVM_TBLGEN=	${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
 TOOL_M4=		${TOOLDIR}/bin/${_TOOL_PREFIX}m4
 TOOL_MACPPCFIXCOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
 TOOL_MAKEFS=		${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
--- a/tools/llvm-clang-tblgen/Makefile	Fri May 17 08:56:12 2019 +0000
+++ b/tools/llvm-clang-tblgen/Makefile	Fri May 17 13:44:55 2019 +0000
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2019/05/16 20:00:49 nakayama Exp $
+#	$NetBSD: Makefile,v 1.3 2019/05/17 13:44:55 nakayama Exp $
 
-HOSTPROGNAME=	${MACHINE_GNU_PLATFORM}-clang-tblgen
-HOSTPROG_CXX=	${MACHINE_GNU_PLATFORM}-clang-tblgen
+HOSTPROGNAME=	${_TOOL_PREFIX}clang-tblgen
+HOSTPROG_CXX=	${_TOOL_PREFIX}clang-tblgen
 HOST_SRCDIR=	external/bsd/llvm/bin/clang-tblgen
 
 .include "${.CURDIR}/../Makefile.host"
--- a/tools/llvm-tblgen/Makefile	Fri May 17 08:56:12 2019 +0000
+++ b/tools/llvm-tblgen/Makefile	Fri May 17 13:44:55 2019 +0000
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2019/05/16 20:00:49 nakayama Exp $
+#	$NetBSD: Makefile,v 1.4 2019/05/17 13:44:55 nakayama Exp $
 
-HOSTPROGNAME=	${MACHINE_GNU_PLATFORM}-llvm-tblgen
-HOSTPROG_CXX=	${MACHINE_GNU_PLATFORM}-llvm-tblgen
+HOSTPROGNAME=	${_TOOL_PREFIX}llvm-tblgen
+HOSTPROG_CXX=	${_TOOL_PREFIX}llvm-tblgen
 HOST_SRCDIR=	external/bsd/llvm/bin/tblgen
 
 .include "${.CURDIR}/../Makefile.host"