From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 7 Mar 2023 07:00:03 +0000 (+0100)
Subject: auxchecks: use outer configure make and compilers
X-Git-Tag: VALGRIND_3_21_0~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2715ad4ab5bc0be1e6a3e87aae29cfab90e01668;p=thirdparty%2Fvalgrind.git

auxchecks: use outer configure make and compilers

On FreeBSD the hard coded 'make' will switch to BSD make rather
than the outer configure make - GNU make.

Similarly for systems with gcc and clang installed then an outer
'configure CC=clang' and then make auxchecks doesn't propagate
the CC to the inner gsl configure, which will use gcc.

Still need some work on the tarball checksum calculation.
---

diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index c05f82825e..9831ee3b41 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -183,9 +183,9 @@ $(GSL_SRC_DIR)/gsl-patched: $(GSL_TAR)
 $(GSL_BUILD_DIR)/gsl-build: $(GSL_SRC_DIR)/gsl-patched
 	mkdir -p $(GSL_BUILD_DIR)
 	(cd $(GSL_BUILD_DIR) && \
-	 $(GSL_SRC_DIR)/configure CFLAGS="$(GSL_CFLAGS)" && \
-	 make -j $(nproc) && \
-	 make check -k || true)
+	 $(GSL_SRC_DIR)/configure CC="${CC}" CXX="${CXX}" CFLAGS="$(GSL_CFLAGS)" && \
+	 ${MAKE} -j $(nproc) && \
+	 ${MAKE} check -k || true)
 	touch $@
 
 # We hope all tests PASS (so don't produce output except for the test names).