Skip to content

Commit 2eefdbe

Browse files
authored
rework Conda structure
1 parent a28597c commit 2eefdbe

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

docs/ci_build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,20 @@ $julia -e '
5656
Pkg.add("Conda"); Pkg.build("Conda"; verbose=true)
5757
using Conda; env, rc = Conda.ROOTENV, Conda.conda_rc(Conda.ROOTENV)
5858
Conda.runconda(`config --set auto_update_conda False --file $rc --force`, env)
59-
Pkg.add("PyCall"); Pkg.build("PyCall"; verbose=true)
6059
if Sys.islinux()
6160
# see discourse.julialang.org/t/glibcxx-version-not-found/82209/8
6261
# julia 1.8.3 is built with libstdc++.so.6.0.29, so we must restrict to this version (gcc 11.3.0, not gcc 12.2.0)
63-
libstdcxx_ver = Base.BinaryPlatforms.detect_libstdcxx_version()
6462
gcc_major = Dict(
6563
v"3.4.29" => 11,
6664
v"3.4.30" => 12,
6765
# ... keep this up-to-date with gcc 13
68-
)[libstdcxx_ver]
66+
)[Base.BinaryPlatforms.detect_libstdcxx_version()]
6967
Conda.add("libgcc-ng=$gcc_major")
7068
Conda.add("libstdcxx-ng=$gcc_major")
7169
end
7270
Conda.add("matplotlib")
7371
Conda.list()
72+
Pkg.add("PyCall"); Pkg.build("PyCall"; verbose=true)
7473
'
7574

7675
# tentative fix for `pyplot` bug: libstdc++.so.X: version `GLIBCXX_X.X.X' not found ...

0 commit comments

Comments
 (0)