]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Use configured CC for pkg-config test
authorMichael Weiser <michael.weiser@gmx.de>
Wed, 28 Mar 2018 20:47:01 +0000 (22:47 +0200)
committerNikos Mavrogiannopoulos <nmav@redhat.com>
Mon, 7 May 2018 12:16:00 +0000 (14:16 +0200)
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>
tests/Makefile.am
tests/pkgconfig.sh

index 27560204d753b6f51ce6c6c62e479ee7fcf93bd0..18e1b7a93970b421234ab58976eab82bfd211629 100644 (file)
@@ -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              \
index 1892dc4577d9fde9abe180b08e162bc6fc14b4f9..e1034162aeee5fa8e6e9815384673c013cdd6e5e 100755 (executable)
@@ -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}