From 338e25e387f93e1781fc143f5d2e2ce2229e5ac9 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 10 Oct 2026 11:02:18 -0700 Subject: [PATCH 1/2] Escape `$` in shell command substitution in a Makefile recipe --- valgrind/auxprogs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/valgrind/auxprogs/Makefile.am b/valgrind/auxprogs/Makefile.am index 3a9709da..279fa874 100644 --- a/valgrind/auxprogs/Makefile.am +++ b/valgrind/auxprogs/Makefile.am @@ -184,7 +184,7 @@ $(GSL_BUILD_DIR)/gsl-build: $(GSL_SRC_DIR)/gsl-patched mkdir -p $(GSL_BUILD_DIR) (cd $(GSL_BUILD_DIR) && \ $(GSL_SRC_DIR)/configure CC="${CC}" CXX="${CXX}" CFLAGS="$(GSL_CFLAGS)" && \ - ${MAKE} -j $(nproc) && \ + ${MAKE} -j $$(nproc) && \ ${MAKE} check -k || true) touch $@ From 673be6e4825f95e1ea65237938a84b715eac38fe Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sun, 11 Oct 2026 19:57:47 -0700 Subject: [PATCH 2/2] Remove the GSL build parallelism, as upstream Valgrind commit ccf065e7 does --- valgrind/auxprogs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/valgrind/auxprogs/Makefile.am b/valgrind/auxprogs/Makefile.am index 279fa874..111c628b 100644 --- a/valgrind/auxprogs/Makefile.am +++ b/valgrind/auxprogs/Makefile.am @@ -184,7 +184,7 @@ $(GSL_BUILD_DIR)/gsl-build: $(GSL_SRC_DIR)/gsl-patched mkdir -p $(GSL_BUILD_DIR) (cd $(GSL_BUILD_DIR) && \ $(GSL_SRC_DIR)/configure CC="${CC}" CXX="${CXX}" CFLAGS="$(GSL_CFLAGS)" && \ - ${MAKE} -j $$(nproc) && \ + ${MAKE} && \ ${MAKE} check -k || true) touch $@