Skip to content

Commit 91cdefb

Browse files
author
Release Manager
committed
Trac #33130: Fix silent "sage -b" after #32759
(from #33125) #32759 slightly broke `sage -b`: It silently rebuilds sagelib and then reports "Nothing to do". This behavior comes from `build/make/install`, which first calls `make -q sagelib` with output suppressed. But `-q` handling got broken by #32759, as explained in #33125. We fix it here. URL: https://trac.sagemath.org/33130 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Michael Orlitzky
2 parents 2e4b8be + 484f6c0 commit 91cdefb

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

build/make/Makefile.in

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,13 @@ else
183183
AM_V_at =
184184
endif
185185

186+
# Trac #33125: Handle make options -n, -t, -q
187+
ifeq ($(foreach flag, n t q, $(findstring $(flag),$(filter-out --%,$(MAKEFLAGS)))),)
188+
PLUS = +
189+
else
190+
PLUS =
191+
endif
192+
186193
# List of targets that can be run using `sage -i` or `sage -f`
187194
# These should generally have an associated -clean target for `sage -f` to
188195
# work correctly
@@ -603,7 +610,7 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
603610
$(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)
604611

605612
$(1)-$(4)-no-deps:
606-
+@if [ -z '$$($(4))' ]; then \
613+
$(PLUS)@if [ -z '$$($(4))' ]; then \
607614
echo "Error: The installation tree $(4) has been disabled" 2>&1; \
608615
echo "$$($(4)_DISABLED_MESSAGE)" 2>&1; \
609616
exit 1; \

0 commit comments

Comments
 (0)