build/bin/sage-build-env[-config]: Do not override SAGE_EDITABLE if i…

…t is set already
sagemath · May 8, 2022 · de18ba0 · de18ba0
1 parent c264e7f
commit de18ba0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/build/bin/sage-build-env b/build/bin/sage-build-env
@@ -27,6 +27,10 @@ if [ "x$SAGE_BUILD_ENV_SOURCED" = "x" ]; then
     if [ "x$SAGE_DEBUG" = "x" ]; then
         export SAGE_DEBUG="$CONFIGURED_SAGE_DEBUG"
     fi
+    # Likewise for SAGE_EDITABLE
+    if [ "x$SAGE_EDITABLE" = "x" ]; then
+        export SAGE_EDITABLE="$CONFIGURED_SAGE_EDITABLE"
+    fi
 
     # This is usually blank if the system GMP is used, or $SAGE_LOCAL otherwise
     if [ -n "$SAGE_GMP_PREFIX" ]; then

diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
@@ -57,4 +57,4 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
 
 export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
 
-export SAGE_EDITABLE="@SAGE_EDITABLE@"
+export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,4 +57,4 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"

		export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"

		export SAGE_EDITABLE="@SAGE_EDITABLE@"
		export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"