File tree Expand file tree Collapse file tree 1 file changed +7
-1
lines changed
Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -114,6 +114,12 @@ function build_julia(ARGS, version; gitref = nothing)
114114
115115 # enable extglob for BB_TRIPLET_LIBGFORTRAN_CXXABI
116116 shopt -s extglob
117+ if [[ "${version}" == 1.6.* ]]; then
118+ # Strip the OS version from Darwin and FreeBSD
119+ BB_TRIPLET_LIBGFORTRAN_CXXABI=$(echo ${bb_full_target/-julia_version+([^-])} | sed 's/\( darwin\| freebsd\) [0-9.]*/\1 /')
120+ else
121+ BB_TRIPLET_LIBGFORTRAN_CXXABI=${bb_full_target/-julia_version+([^-])}
122+ fi
117123
118124 cat << EOM >Make.user
119125 USE_SYSTEM_LLVM=1
@@ -154,7 +160,7 @@ function build_julia(ARGS, version; gitref = nothing)
154160 # julia expects libuv-julia.a
155161 override LIBUV=${prefix}/lib/libuv.a
156162
157- override BB_TRIPLET_LIBGFORTRAN_CXXABI=${bb_full_target/-julia_version+([^-]) }
163+ override BB_TRIPLET_LIBGFORTRAN_CXXABI=${BB_TRIPLET_LIBGFORTRAN_CXXABI }
158164 override USE_BINARYBUILDER=1
159165
160166 prefix=${prefix}
You can’t perform that action at this time.
0 commit comments