From 65bf7e0a1ca6386f17608e8afb84ac470c18d23f Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 Apr 2024 15:41:08 +0100 Subject: [PATCH] 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. --- build-aux/ci_build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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"