Module Name: src
Committed By: nakayama
Date: Fri May 17 13:44:55 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/llvm-clang-tblgen: Makefile
src/tools/llvm-tblgen: Makefile
Log Message:
Revert previous.
The binaries created are different, but according to joerg@ there
is no difference in functionality.
To generate a diff of this commit:
cvs rdiff -u -r1.1135 -r1.1136 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-clang-tblgen/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/llvm-tblgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1135 src/share/mk/bsd.own.mk:1.1136
--- src/share/mk/bsd.own.mk:1.1135 Thu May 16 20:00:49 2019
+++ src/share/mk/bsd.own.mk Fri May 17 13:44:55 2019
@@ -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_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX
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_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PR
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
Index: src/tools/llvm-clang-tblgen/Makefile
diff -u src/tools/llvm-clang-tblgen/Makefile:1.2 src/tools/llvm-clang-tblgen/Makefile:1.3
--- src/tools/llvm-clang-tblgen/Makefile:1.2 Thu May 16 20:00:49 2019
+++ src/tools/llvm-clang-tblgen/Makefile Fri May 17 13:44:55 2019
@@ -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"
Index: src/tools/llvm-tblgen/Makefile
diff -u src/tools/llvm-tblgen/Makefile:1.3 src/tools/llvm-tblgen/Makefile:1.4
--- src/tools/llvm-tblgen/Makefile:1.3 Thu May 16 20:00:49 2019
+++ src/tools/llvm-tblgen/Makefile Fri May 17 13:44:55 2019
@@ -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"
