Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit e03c5ac

Browse files
author
Matthias Koeppe
committed
build/bin/sage-build-env: Set SETUPTOOLS_USE_DISTUTILS here, not in build/pkgs/sagelib/spkg-install
1 parent 4e777e7 commit e03c5ac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/bin/sage-build-env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,7 @@ else
106106
export F77FLAGS_NON_NATIVE="$ORIGINAL_F77FLAGS"
107107
export F77FLAGS_O3_NON_NATIVE="$ORIGINAL_F77FLAGS"
108108
fi
109+
110+
# Trac #31335: Avoid include paths leaking in from homebrew python3's distutils.cfg
111+
# by using setuptools' own copy of distutils instead of relying on stdlib distutils.
112+
export SETUPTOOLS_USE_DISTUTILS=local

build/pkgs/sagelib/spkg-install

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ export SAGE_SHARE=/doesnotexist
3939
# spec, which includes setting a symlink to the installed documentation.
4040
# export SAGE_DOC=/doesnotexist
4141

42-
# Trac #31335: Avoid include paths leaking in from homebrew python3's distutils.cfg
43-
# by using setuptools' own copy of distutils instead of relying on stdlib distutils.
44-
export SETUPTOOLS_USE_DISTUTILS=local
45-
4642
time "$PYTHON" -u setup.py --no-user-cfg build install || exit 1
4743
if [ "$UNAME" = "CYGWIN" ]; then
4844
sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null;

0 commit comments

Comments
 (0)