Merge remote-tracking branch 'origin/stable/10' into develdevel

3 files changed, 19 insertions, 1 deletions

diff --git a/contrib/netbsd-tests/share/mk/t_lib.sh b/contrib/netbsd-tests/share/mk/t_lib.sh
index 5f18e14..0187aa2 100755
--- a/contrib/netbsd-tests/share/mk/t_lib.sh
+++ b/contrib/netbsd-tests/share/mk/t_lib.sh
@@ -31,6 +31,12 @@ defaults__build_and_install_body() {
 	create_c_module module1 first
 	create_c_module module2 second
 
+	CC=gcc
+	if [ ! -e /usr/bin/gcc -a -e /usr/bin/clang ]; then
+		export HAVE_LLVM=yes
+		CC=clang
+	fi
+
 	cat >Makefile <<EOF
 LIB = two-modules
 SRCS = module1.c module2.c
@@ -44,7 +50,7 @@ EOF
 	atf_check -o ignore make install
 
 	create_main_using_modules main.c module1.h:first module2.h:second
-	atf_check -o ignore gcc -I. -Lroot/usr/lib -o main main.c -ltwo-modules
+	atf_check -o ignore ${CC} -I. -Lroot/usr/lib -o main main.c -ltwo-modules
 
 	atf_check -o inline:'module1\nmodule2\n' ./main
 }
diff --git a/contrib/netbsd-tests/share/mk/t_prog.sh b/contrib/netbsd-tests/share/mk/t_prog.sh
index d004070..e21f1f6 100755
--- a/contrib/netbsd-tests/share/mk/t_prog.sh
+++ b/contrib/netbsd-tests/share/mk/t_prog.sh
@@ -31,6 +31,10 @@ defaults__build_and_install_head() {
 	atf_set "require.progs" "/usr/bin/mandoc"
 }
 defaults__build_and_install_body() {
+	if [ ! -e /usr/bin/gcc -a -e /usr/bin/clang ]; then
+		export HAVE_LLVM=yes
+	fi
+
 	cat >hello.c <<EOF
 #include <stdio.h>
 int main(void) { printf("Hello, test!\n"); return 0; }
@@ -61,6 +65,10 @@ EOF
 
 atf_test_case without_man__build_and_install
 without_man__build_and_install_body() {
+	if [ ! -e /usr/bin/gcc -a -e /usr/bin/clang ]; then
+		export HAVE_LLVM=yes
+	fi
+
 	cat >hello.c <<EOF
 #include <stdio.h>
 int main(void) { printf("Hello, test!\n"); return 0; }
diff --git a/contrib/netbsd-tests/share/mk/t_test.sh b/contrib/netbsd-tests/share/mk/t_test.sh
index c8bb1f3..08681d8 100755
--- a/contrib/netbsd-tests/share/mk/t_test.sh
+++ b/contrib/netbsd-tests/share/mk/t_test.sh
@@ -34,6 +34,10 @@
 # The second argument is the name of the test program, without an extension.
 # The corresponding source file must exist in the current directory.
 one_test() {
+
+	if [ ! -e /usr/bin/gcc -a -e /usr/bin/clang ]; then
+		export HAVE_LLVM=yes
+	fi
 	local lang="${1}"; shift
 	local name="${1}"; shift