Skip to content

Commit c673dd8

Browse files
author
Giorgis Georgakoudis
committed
Use one conda env and export absolute paths
1 parent 0da8dd9 commit c673dd8

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

buildscripts/cibuildwheel/setup-miniconda3.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ echo "Miniconda installed"
2323
source "_stage/miniconda3/bin/activate" base
2424
export CONDA_PLUGINS_AUTO_ACCEPT_TOS=true
2525

26-
# Create llvmdev environment and install llvmdev ${LLVM_VERSION}.
26+
# Create clangdev ${LLVM_VERSION}
2727
echo "Installing manylinux llvmdev ${LLVM_VERSION}..."
28-
conda create -n llvmdev-${LLVM_VERSION} -c conda-forge -y llvmdev=${LLVM_VERSION}
29-
30-
# Create clang environment and install clang ${LLVM_VERSION}.
31-
echo "Installing clang ${LLVM_VERSION}..."
32-
conda create -n clang-${LLVM_VERSION} -c conda-forge -y clang=${LLVM_VERSION}
28+
conda create -n llvmdev-${LLVM_VERSION} -c conda-forge -q -y clangdev=${LLVM_VERSION} llvmdev=${LLVM_VERSION}

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ before-all = [
6666
]
6767

6868
[tool.cibuildwheel.environment]
69-
LLVM_DIR = "_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}"
70-
CLANG_TOOL = "_stage/miniconda3/envs/clang-${LLVM_VERSION}/bin/clang"
69+
LLVM_DIR = "${PWD}/_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}"
70+
PATH = "${PWD}/_stage/miniconda3/envs/llvmdev-${LLVM_VERSION}/bin:${PATH}"
7171
USE_CXX11_ABI = "1"
7272
PIP_NO_INPUT = "1"

0 commit comments

Comments
 (0)