Fixup: forward correctly LLVM_VERSION to the cibuildwheel env

ggeorgakoudis · ggeorgakoudis · commit a12ccdd95253 · 2026-01-25T19:29:59.000-08:00
diff --git a/.github/workflows/build-upload-wheels.yml b/.github/workflows/build-upload-wheels.yml
@@ -38,10 +38,10 @@ jobs:
         run: python -m pip install cibuildwheel==3.1.4
 
       - name: Build wheels {{ matrix.os }}
-        # Set LLVM_VERSION for the host and cibuildwheel environment.
+        # Set LLVM_VERSION for the host to forward to the cibuildwheel
+        # environment.
         env:
           LLVM_VERSION: "15.0.7"
-          CIBW_ENVIRONMENT: "LLVM_VERSION=15.0.7"
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
diff --git a/pyproject.toml b/pyproject.toml
@@ -64,6 +64,7 @@ before-all = [
 ]
 
 [tool.cibuildwheel.environment]
+LLVM_VERSION = "${LLVM_VERSION}"
 LLVM_DIR = "_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}"
 CLANG_TOOL = "_stage/miniconda3/envs/clang-${LLVM_VERSION}/bin/clang"
 USE_CXX11_ABI = "1"

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ before-all = [`
`64`	`64`	`]`
`65`	`65`
`66`	`66`	`[tool.cibuildwheel.environment]`
	`67`	`+LLVM_VERSION = "${LLVM_VERSION}"`
`67`	`68`	`LLVM_DIR = "_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}"`
`68`	`69`	`CLANG_TOOL = "_stage/miniconda3/envs/clang-${LLVM_VERSION}/bin/clang"`
`69`	`70`	`USE_CXX11_ABI = "1"`