Skip to content

Commit

Permalink
Remove -e from .cirrus.yml make invocations
Browse files Browse the repository at this point in the history
"make -e" causes variables to be set from the environment,
overriding those from configure, which is not what we want.

Where set, CFLAGS, CPPFLAGS and LDFLAGS are all now passed to
configure. CPPFLAGS is set for -fsanitize=address,undefined
to prevent unaligned access in HTSlib.
  • Loading branch information
daviesrob committed Aug 29, 2024
1 parent efe6c14 commit 04e58e7
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ htslib_compile_template: &HTSLIB_COMPILE
cd $HTSDIR
autoreconf -i
if test "x$WERROR" != "xno"; then CONFIG_OPTS="--enable-werror"; fi
eval ./configure $CONFIG_OPTS --prefix=`pwd`/../inst CFLAGS=\"$CFLAGS\" || (cat config.log; /bin/false)
make -j3 -e install
eval ./configure $CONFIG_OPTS --prefix=`pwd`/../inst \
CFLAGS=\"$CFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\" \
|| (cat config.log; /bin/false)
make -j3 install
#--------------------------------------------------
# Template: samtools compile and test
Expand All @@ -44,17 +46,17 @@ compile_template: &COMPILE
if test "x$WERROR" != "xno"; then CONFIG_OPTS="--enable-werror"; fi
eval ./configure $CONFIG_OPTS --with-htslib=`pwd`/inst \
LDFLAGS=\"$LDFLAGS -Wl,-rpath,`pwd`/inst/lib\" \
CFLAGS=\"$CFLAGS\"|| \
CFLAGS=\"$CFLAGS\" CPPFLAGS=\"$CPPFLAGS\" || \
(cat config.log; /bin/false)
make -j3
test_template: &TEST
test_script: |
if test "x$DO_MAINTAINER_CHECKS" = "xyes" ; then
make -e maintainer-check
make maintainer-check
fi
make -e
make -e test BGZIP=inst/bin/bgzip
make
make test BGZIP=inst/bin/bgzip
#--------------------------------------------------
Expand All @@ -73,8 +75,9 @@ gcc_task:
CIRRUS_CLONE_DEPTH: 1
HTSDIR: ./hidden-htslib
DO_MAINTAINER_CHECKS: yes
WERROR: no
WERROR: yes
CFLAGS: -g -O3 -std=c99 -D_XOPEN_SOURCE=600 -pedantic -fsanitize=address,undefined
CPPFLAGS: -DHTS_ALLOW_UNALIGNED=0
LDFLAGS: -fsanitize=address,undefined

<< : *COMPILE
Expand Down

0 comments on commit 04e58e7

Please sign in to comment.