fix sage -b after 30622

sagemath · Jan 19, 2021 · fec4b06 · fec4b06
1 parent 13b4090
commit fec4b06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -22,9 +22,13 @@ ifndef SAGE_PKGCONFIG
 # Set by build/bin/sage-sdist, which invokes the Makefile directly in
 # order to download upstream packages for distribution.
 ifndef SAGE_SPKG_COPY_UPSTREAM
+# Set by ``sage -b`` etc.
+# In this case ``SAGE_PKGCONFIG`` is not required.
+ifndef SAGE_SAGELIB_NO_DEPS
 $(error This Makefile needs to be invoked by build/make/install)
 endif
 endif
+endif
 
 # Directory to keep track of which packages are installed
 SAGE_SPKG_INST = $(SAGE_LOCAL)/var/lib/sage/installed

diff --git a/src/bin/sage b/src/bin/sage
@@ -804,7 +804,7 @@ fi
 
 build_sage() {
     maybe_sage_location
-    ( cd "$SAGE_ROOT/build/make" && $MAKE sagelib-no-deps ) || exit $?
+    ( cd "$SAGE_ROOT/build/make" && SAGE_SAGELIB_NO_DEPS='yes' $MAKE sagelib-no-deps ) || exit $?
 }
 
 if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then