8000 set PKG_CONFIG_PATH for windows, add CXXFLAGS · numpy/numpy@9999c3f · GitHub
[go: up one dir, main page]
Skip to content

Commit 9999c3f

Browse files
mattipmattip
committed
set PKG_CONFIG_PATH for windows, add CXXFLAGS
1 parent 067e514 commit 9999c3f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

‎pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
147147
manylinux-x86_64-image = "manylinux2014"
148148
manylinux-aarch64-image = "manylinux2014"
149149
musllinux-x86_64-image = "musllinux_1_1"
150-
environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
150+
environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="-Wl,--strip-debug", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux"}
151151

152152
[tool.cibuildwheel.macos]
153153
# For universal2 wheels, we will need to fuse them manually
@@ -158,10 +158,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_",
158158
archs = "x86_64 arm64"
159159
test-skip = "*_universal2:arm64"
160160
# MACOS linker doesn't support stripping symbols
161-
environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
161+
environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
162162

163163
[tool.cibuildwheel.windows]
164-
environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
164+
environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
165165

166166
[[tool.cibuildwheel.overrides]]
167167
select = "*-win32"

‎tools/wheels/cibw_before_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ elif [[ $RUNNER_OS == "Windows" ]]; then
3838
cp -r $target/$f openblas
3939
done
4040
ls openblas
41+
echo "PKG_CONFIG_PATH=$PWD/openblas/lib/pkgconfig;" >> $env:GITHUB_ENV
4142
fi
4243

4344
if [[ $RUNNER_OS == "macOS" ]]; then

0 commit comments

Comments
 (0)
0