Skip to content

Commit 52b14cc

Browse files
giordanofingolfin
authored andcommitted
[libjulia] Fix BB_TRIPLET_LIBGFORTRAN_CXXABI for BSD systems
1 parent 0778c8b commit 52b14cc

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

L/libjulia/common.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ function build_julia(ARGS, version)
107107
108108
# enable extglob for BB_TRIPLET_LIBGFORTRAN_CXXABI
109109
shopt -s extglob
110+
if [[ "${version}" == 1.6.* ]]; then
111+
# Strip the OS version from Darwin and FreeBSD
112+
BB_TRIPLET_LIBGFORTRAN_CXXABI=$(echo ${bb_full_target/-julia_version+([^-])} | sed 's/\(darwin\|freebsd\)[0-9.]*/\1/')
113+
else
114+
BB_TRIPLET_LIBGFORTRAN_CXXABI=${bb_full_target/-julia_version+([^-])}
115+
fi
110116
111117
cat << EOM >Make.user
112118
USE_SYSTEM_LLVM=1
@@ -147,7 +153,7 @@ function build_julia(ARGS, version)
147153
# julia expects libuv-julia.a
148154
override LIBUV=${prefix}/lib/libuv.a
149155
150-
override BB_TRIPLET_LIBGFORTRAN_CXXABI=${bb_full_target/-julia_version+([^-])}
156+
override BB_TRIPLET_LIBGFORTRAN_CXXABI=${BB_TRIPLET_LIBGFORTRAN_CXXABI}
151157
override USE_BINARYBUILDER=1
152158
153159
prefix=${prefix}

0 commit comments

Comments
 (0)