clang-git: clang-netbsd: compiler-rt-git: compiler-rt-netbsd: Fixes

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jun 7 17:58:14 2017 +0200
Changeset:	31c70c51d38d1f3a928ee15a0a2edaa2a8b38ad9

Modified Files:
	clang-git/Makefile.common
	clang-netbsd/Makefile.common
	compiler-rt-git/Makefile
	compiler-rt-netbsd/Makefile

Log Message:
clang-git: clang-netbsd: compiler-rt-git: compiler-rt-netbsd: Fixes

Correct path to NetBSD toolchain file in Clang.
Remove test macros in compiler-rt, this is tested through Clang.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31c70c51d38d1f3a928ee15a0a2edaa2a8b38ad9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clang-git/Makefile.common    | 3 +--
 clang-netbsd/Makefile.common | 3 +--
 compiler-rt-git/Makefile     | 3 ---
 compiler-rt-netbsd/Makefile  | 3 ---
 4 files changed, 2 insertions(+), 10 deletions(-)

diffs:
diff --git a/clang-git/Makefile.common b/clang-git/Makefile.common
index f3673dbd9b..4c3e65bdd5 100644
--- a/clang-git/Makefile.common
+++ b/clang-git/Makefile.common
@@ -80,8 +80,7 @@ LIBCPP_CHECK_SH=	echo NO
 SUBST_CLASSES+=			libcxx
 SUBST_STAGE.libcxx=		pre-configure
 SUBST_MESSAGE.libcxx=		Patching toolchain to use libstdc++ (matching the host compiler)
-SUBST_FILES.libcxx=		lib/Driver/ToolChains.cpp
-SUBST_FILES.libcxx+=		lib/Driver/Tools.cpp
+SUBST_FILES.libcxx+=		lib/Driver/ToolChains/NetBSD.cpp
 SUBST_SED.libcxx=		-e 's,(Major >= 7 || Major == 0),(false),'
 
 CMAKE_ARGS+=			-DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index 91f865092d..de24c308ca 100644
--- a/clang-netbsd/Makefile.common
+++ b/clang-netbsd/Makefile.common
@@ -81,8 +81,7 @@ LIBCPP_CHECK_SH=	echo NO
 SUBST_CLASSES+=			libcxx
 SUBST_STAGE.libcxx=		pre-configure
 SUBST_MESSAGE.libcxx=		Patching toolchain to use libstdc++ (matching the host compiler)
-SUBST_FILES.libcxx=		lib/Driver/ToolChains.cpp
-SUBST_FILES.libcxx+=		lib/Driver/Tools.cpp
+SUBST_FILES.libcxx+=		lib/Driver/ToolChains/NetBSD.cpp
 SUBST_SED.libcxx=		-e 's,(Major >= 7 || Major == 0),(false),'
 
 CMAKE_ARGS+=			-DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
diff --git a/compiler-rt-git/Makefile b/compiler-rt-git/Makefile
index c6222c0f79..cc5e8568c5 100644
--- a/compiler-rt-git/Makefile
+++ b/compiler-rt-git/Makefile
@@ -28,9 +28,6 @@ CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 
 CMAKE_ARG_PATH=	${WRKDIR}/compiler-rt
 
-TEST_TARGET=		check-compiler-rt
-TEST_ENV+=		LD_LIBRARY_PATH=${WRKDIR}/build/lib
-
 post-extract:
 	${RUN} mkdir -p ${WRKDIR}/build
 
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 4d793292ef..6367ade0b6 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -24,9 +24,6 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 
-TEST_TARGET=		check-compiler-rt
-TEST_ENV+=		LD_LIBRARY_PATH=${WRKDIR}/build/lib
-
 post-extract:
 	${RUN} mkdir -p ${WRKDIR}/build