Build with the compiler the release script probed

Git's Makefile sets CC = cc, which wins over a CC in the environment, so
CC=clang ./tools/release-build.sh probed clang's flags and then built
with cc.

1 file changed, 4 insertions, 2 deletions

diff --git a/tools/release-build.sh b/tools/release-build.shindex e19f5b7..fc280ae 100755--- a/tools/release-build.sh+++ b/tools/release-build.sh@@ -86,7 +86,9 @@ CGIT_EXTRA_CFLAGS="-Wformat -Wformat-security -Werror=format-security"  # The build starts from clean so the bundled git objects pick up the same # flags, and cleanall rather than clean because only cleanall descends into-# vendor/git.+# vendor/git. CC goes on the command line because git's Makefile sets it,+# which would override the one from the environment the flags were probed+# with. make cleanall-exec make "$@" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \+exec make "$@" CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ 	CGIT_EXTRA_CFLAGS="$CGIT_EXTRA_CFLAGS"
diff --git a/tools/release-build.sh b/tools/release-build.sh
index e19f5b7..fc280ae 100755
--- a/tools/release-build.sh
+++ b/tools/release-build.sh
@@ -86,7 +86,9 @@ CGIT_EXTRA_CFLAGS="-Wformat -Wformat-security -Werror=format-security"
 
 # The build starts from clean so the bundled git objects pick up the same
 # flags, and cleanall rather than clean because only cleanall descends into
-# vendor/git.
+# vendor/git. CC goes on the command line because git's Makefile sets it,
+# which would override the one from the environment the flags were probed
+# with.
 make cleanall
-exec make "$@" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+exec make "$@" CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
 	CGIT_EXTRA_CFLAGS="$CGIT_EXTRA_CFLAGS"