Skip to content

Commit

Permalink
removing dumb actions bash compiler swap since yaml programming is so…
Browse files Browse the repository at this point in the history
… terrible
  • Loading branch information
peekxc committed Dec 5, 2023
1 parent 289c20d commit 7fec1f1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,7 @@ jobs:
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel
- name: Set compiler
run: |
if [ ${{ matrix.buildplat[1] }} == 'macosx' ]; then
echo "CC=/usr/local/opt/llvm/bin/clang" >> $GITHUB_ENV
echo "CXX=/usr/local/opt/llvm/bin/clang++" >> $GITHUB_ENV
elif [ ${{ matrix.buildplat[1] }} == 'win' ]; then
echo "CC=gcc" >> $GITHUB_ENV
echo "CXX=g++" >> $GITHUB_ENV
fi
- name: Build wheels
uses: pypa/[email protected]
env:
Expand Down
11 changes: 9 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,16 @@ skip = "cp36-* cp37-* cp38-* pp* *_ppc64le *_i686 *_s390x"

[tool.cibuildwheel.macos]
before-build = "bash {project}/tools/cibw_macos.sh"
# environment = { CXX = "/usr/local/opt/llvm/bin/clang", CC = "/usr/local/opt/llvm/bin/clang" }
environment = {
CC = "/usr/local/opt/llvm/bin/clang"
CXX = "/usr/local/opt/llvm/bin/clang++"
}

[tool.cibuildwheel.windows]
# before-build = "sh tools/cibw_windows.sh"
before-build = "choco install rtools -y --no-progress --force --version=4.0.0.20220206 && set PATH=C:\\rtools40\\ucrt64\\bin\\;%PATH%"
environment = { PKG_CONFIG_PATH = "C:/opt/64/lib/pkgconfig" }
environment = {
PKG_CONFIG_PATH = "C:/opt/64/lib/pkgconfig"
CXX = "g++",
CC = "gcc"
}

0 comments on commit 7fec1f1

Please sign in to comment.