Skip to content

Commit

Permalink
Simplify call to flint's configure script (autotools)
Browse files Browse the repository at this point in the history
It no longer supports the LIB_DIRS variable but it does support CPPFLAGS and
LDFLAGS, so there's no reason to define our own CONFIGURECMD variable.
Instead, we can use the default one and just define PRECONFIGURE and add a
couple things CONFIGOPTIONS.

[ci skip]
  • Loading branch information
d-torrance committed Sep 10, 2024
1 parent 954e44c commit a631688
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions M2/libraries/flint/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ CONFIGOPTIONS += --enable-assert
CFLAGS += -O0 -fno-unroll-loops
endif
CFLAGS += -std=c90 -pedantic-errors
# the flint configure script does not accept CPPFLAGS
# CONFIGURECMD = LIB_DIRS=$(LIBRARIESDIR)/lib ./configure --with-gc --with-blas --disable-tls
CONFIGURECMD = ./bootstrap.sh && \
LIB_DIRS=$(LIBRARIESDIR)/lib ./configure --without-blas \
--prefix='$(PREFIX)' --disable-shared CC='$(CC)' \
CFLAGS='$(CFLAGS) $(CPPFLAGS)'

PRECONFIGURE = ./bootstrap.sh
CONFIGOPTIONS += --without-blas --disable-shared

ifneq ($(VERBOSE),)
BUILDOPTIONS += AT= QUIET_CC= QUIET_CXX= QUIET_AR=
Expand Down

0 comments on commit a631688

Please sign in to comment.