Skip to content

Commit 0f80c36

Browse files
committed
MAINT: clean up PKG_CONFIG_PATH usage in cibw_before_build.sh
1 parent aaeb92e commit 0f80c36

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

tools/wheels/cibw_before_build.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,16 @@ if [[ "$INSTALL_OPENBLAS" = "true" ]] ; then
3636
elif [[ $RUNNER_ARCH == "ARM64" && $RUNNER_OS == "Windows" ]] ; then
3737
OPENBLAS=openblas32
3838
fi
39-
PKG_CONFIG_PATH=$PROJECT_DIR/.openblas
40-
echo PKG_CONFIG_PATH is $PKG_CONFIG_PATH, OPENBLAS is ${OPENBLAS}
41-
rm -rf $PKG_CONFIG_PATH
42-
mkdir -p $PKG_CONFIG_PATH
39+
40+
# The PKG_CONFIG_PATH environment variable will be pointed to this path in
41+
# cibuildwheel.toml and .github/workflows/wheels.yml. Note that
42+
# `pkgconf_path` here is only a bash variable local to this file.
43+
pkgconf_path=$PROJECT_DIR/.openblas
44+
echo pkgconf_path is $pkgconf_path, OPENBLAS is ${OPENBLAS}
45+
rm -rf $pkgconf_path
46+
mkdir -p $pkgconf_path
4347
python -m pip install -r $PROJECT_DIR/requirements/openblas_requirements.txt
44-
python -c "import scipy_${OPENBLAS}; print(scipy_${OPENBLAS}.get_pkg_config())" > $PKG_CONFIG_PATH/scipy-openblas.pc
48+
python -c "import scipy_${OPENBLAS}; print(scipy_${OPENBLAS}.get_pkg_config())" > $pkgconf_path/scipy-openblas.pc
4549

4650
# Copy scipy-openblas DLL's to a fixed location so we can point delvewheel
4751
# at it in `repair_windows.sh` (needed only on Windows because of the lack
@@ -50,7 +54,7 @@ if [[ "$INSTALL_OPENBLAS" = "true" ]] ; then
5054
python <<EOF
5155
import os, scipy_${OPENBLAS}, shutil
5256
srcdir = os.path.join(os.path.dirname(scipy_${OPENBLAS}.__file__), "lib")
53-
shutil.copytree(srcdir, os.path.join("$PKG_CONFIG_PATH", "lib"))
57+
shutil.copytree(srcdir, os.path.join("$pkgconf_path", "lib"))
5458
EOF
5559
fi
5660
fi

0 commit comments

Comments
 (0)