From: Sam James <sam@gentoo.org>
Date: Wed, 10 Apr 2024 14:41:08 +0000 (+0100)
Subject: ci: default to -O2
X-Git-Tag: v5.7.1alpha~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65bf7e0a1ca6386f17608e8afb84ac470c18d23f;p=thirdparty%2Fxz.git

ci: default to -O2

We need this for when we're passing sanitizer flags or -gdwarf-4 for Clang
with Valgrind. Just always start with -O2 if CFLAGS isn't set in the
environment and append what was passed on the command line.
---

diff --git a/build-aux/ci_build.sh b/build-aux/ci_build.sh
index e92d88c9..da780f33 100755
--- a/build-aux/ci_build.sh
+++ b/build-aux/ci_build.sh
@@ -48,6 +48,7 @@ DEST_DIR="$SRC_DIR/../xz_build"
 PHASE="all"
 ARTIFACTS_DIR_NAME="output"
 
+[[ -z ${CFLAGS} ]] && export CFLAGS="-O2"
 
 ###################
 # Parse arguments #
@@ -105,7 +106,7 @@ while getopts a:b:c:d:l:m:n:s:p:f:w:h opt; do
 	p) PHASE="$OPTARG"
 	;;
 	f)
-		CFLAGS="$OPTARG"
+		CFLAGS+=" $OPTARG"
 		export CFLAGS
 	;;
 	w) WRAPPER="$OPTARG"