From: Michael Weiser <michael.weiser@gmx.de>
Date: Wed, 28 Mar 2018 20:47:01 +0000 (+0200)
Subject: Use configured CC for pkg-config test
X-Git-Tag: gnutls_3_6_3~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78946f2b4948348fcf594ccc2d201e33cf6da288;p=thirdparty%2Fgnutls.git

Use configured CC for pkg-config test

Using the configured compiler aids in running the test suite under qemu
or in a multlib scenario.

Signed-off-by: Michael Weiser <michael.weiser@gmx.de>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27560204d7..18e1b7a939 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -425,6 +425,7 @@ check_PROGRAMS = $(ctests) $(indirect_tests)
 TESTS = $(ctests) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT +=						\
+	CC="$(CC)"						\
 	CFLAGS="$(CFLAGS)"					\
 	LC_ALL="C"						\
 	LSAN_OPTIONS=suppressions=gnutls-asan.supp		\
diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh
index 1892dc4577..e1034162ae 100755
--- a/tests/pkgconfig.sh
+++ b/tests/pkgconfig.sh
@@ -23,6 +23,7 @@
 srcdir="${srcdir:-.}"
 top_builddir="${top_builddir:-..}"
 PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}"
+CC=${CC:-cc}
 unset RETCODE
 TMPFILE=c.$$.tmp.c
 TMPFILE_O=c.$$.tmp.o
@@ -71,12 +72,12 @@ echo "  * flags: $(${PKGCONFIG} --libs gnutls)"
 echo "  * common: ${COMMON}"
 echo "  * lib: ${CFLAGS}"
 echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
+${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
 
 echo ""
 echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)"
 echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
+${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
 
 rm -f ${TMPFILE} ${TMPFILE_O}