Clean up the whole tree

1 file changed, 3 insertions, 9 deletions

diff --git a/tools/release-build.sh b/tools/release-build.shindex 0d9008f..babf008 100755--- a/tools/release-build.sh+++ b/tools/release-build.sh@@ -38,10 +38,7 @@ supports() { probe=$(mktemp "${TMPDIR:-/tmp}/cgit-probe.XXXXXX") trap 'rm -f "$probe" "$probe.c" "$probe.out"' EXIT -CFLAGS="-O2 -g -Wall \-  -fstack-protector-strong \-  -fPIE \-  -fno-plt"+CFLAGS="-O2 -g -Wall -fstack-protector-strong -fPIE -fno-plt"  # Level 3 adds the bounds checks level 2 could not prove, and needs GCC 12 or # Clang 15. Fall back rather than lose fortification altogether.@@ -57,9 +54,7 @@ if supports "-fstack-clash-protection"; then 	CFLAGS="$CFLAGS -fstack-clash-protection" fi -LDFLAGS="-pie \-  -Wl,-z,relro,-z,now \-  -Wl,-z,noexecstack"+LDFLAGS="-pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack"  # These reach only the cgit objects, so git's own sources are not held to them. # -Wformat-security is an error because a non-literal format with no arguments@@ -76,5 +71,4 @@ CGIT_EXTRA_CFLAGS="-Wformat -Wformat-security -Werror=format-security" # flags, and cleanall rather than clean because only cleanall descends into # vendor/git. make cleanall-exec make "$@" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \-	CGIT_EXTRA_CFLAGS="$CGIT_EXTRA_CFLAGS"+exec make "$@" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CGIT_EXTRA_CFLAGS="$CGIT_EXTRA_CFLAGS"
diff --git a/tools/release-build.sh b/tools/release-build.sh
index 0d9008f..babf008 100755
--- a/tools/release-build.sh
+++ b/tools/release-build.sh
@@ -38,10 +38,7 @@ supports() {
 probe=$(mktemp "${TMPDIR:-/tmp}/cgit-probe.XXXXXX")
 trap 'rm -f "$probe" "$probe.c" "$probe.out"' EXIT
 
-CFLAGS="-O2 -g -Wall \
-  -fstack-protector-strong \
-  -fPIE \
-  -fno-plt"
+CFLAGS="-O2 -g -Wall -fstack-protector-strong -fPIE -fno-plt"
 
 # Level 3 adds the bounds checks level 2 could not prove, and needs GCC 12 or
 # Clang 15. Fall back rather than lose fortification altogether.
@@ -57,9 +54,7 @@ if supports "-fstack-clash-protection"; then
 	CFLAGS="$CFLAGS -fstack-clash-protection"
 fi
 
-LDFLAGS="-pie \
-  -Wl,-z,relro,-z,now \
-  -Wl,-z,noexecstack"
+LDFLAGS="-pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack"
 
 # These reach only the cgit objects, so git's own sources are not held to them.
 # -Wformat-security is an error because a non-literal format with no arguments
@@ -76,5 +71,4 @@ CGIT_EXTRA_CFLAGS="-Wformat -Wformat-security -Werror=format-security"
 # flags, and cleanall rather than clean because only cleanall descends into
 # vendor/git.
 make cleanall
-exec make "$@" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-	CGIT_EXTRA_CFLAGS="$CGIT_EXTRA_CFLAGS"
+exec make "$@" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CGIT_EXTRA_CFLAGS="$CGIT_EXTRA_CFLAGS"