Skip to content

Commit f50a41b

Browse files
committed
update setup_conda_environment.sh to install conda dependencies with single solve
1 parent c3a1bbb commit f50a41b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

buildscripts/incremental/setup_conda_environment.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ set +v
2222
source activate $CONDA_ENV
2323
set -v
2424

25-
# Install llvmdev 20
26-
$CONDA_INSTALL numba/label/dev::llvmdev=20
27-
28-
# Install the compiler toolchain, for osx, bootstrapping needed
29-
# which happens in build.sh
25+
# Install llvmdev 20 and compiler toolchain for linux
3026
if [[ "$(uname)" == "Linux" ]]; then
31-
$CONDA_INSTALL gcc_linux-64 gxx_linux-64
27+
$CONDA_INSTALL numba/label/dev::llvmdev=20 gcc_linux-64 gxx_linux-64
28+
else
29+
$CONDA_INSTALL numba/label/dev::llvmdev=20
3230
fi
3331

3432
# Install dependencies for code coverage (codecov.io)

0 commit comments

Comments
 (0)