@@ -5,7 +5,7 @@ using BinaryBuilder, Pkg
55include (" ../../fancy_toys.jl" ) # for get_addable_spec
66
77# list of supported Julia versions
8- julia_full_versions = [v " 1.6.3" , v " 1.7.0" , v " 1.8.2" , v " 1.9.0" , v " 1.10.0-beta3 " , v " 1.11.0-DEV" ]
8+ julia_full_versions = [v " 1.6.3" , v " 1.7.0" , v " 1.8.2" , v " 1.9.0" , v " 1.10.0-rc1 " , v " 1.11.0-DEV" ]
99if ! @isdefined julia_versions
1010 julia_versions = Base. thispatch .(julia_full_versions)
1111end
@@ -50,14 +50,14 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
5050 v " 1.9.0" => " 48f4c8a7d5f33d0bc6ce24226df20ab49e385c2d0c3767ec8dfdb449602095b2" ,
5151 )
5252
53- if version == v " 1.10.0-beta3 "
53+ if version == v " 1.10.0-rc1 "
5454 sources = [
55- GitSource (" https://github.com/JuliaLang/julia.git" , " 404750f8586d77a7d1832e0dfb1b1931fcf191ac " ),
55+ GitSource (" https://github.com/JuliaLang/julia.git" , " 5aaa94854367ca875375e38ae14f369f124e7315 " ),
5656 DirectorySource (" ./bundled" ),
5757 ]
5858 elseif version == v " 1.11.0-DEV"
5959 sources = [
60- GitSource (" https://github.com/JuliaLang/julia.git" , " a988992b9b5aea642ab0a7cf442bbcecc25cd536 " ),
60+ GitSource (" https://github.com/JuliaLang/julia.git" , " 42c088b8b3e678edd19e5cb9ea54503e43624d06 " ),
6161 DirectorySource (" ./bundled" ),
6262 ]
6363 else
@@ -265,6 +265,12 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
265265 EOM
266266 fi
267267
268+ # lld is too strict about some libraries that were built a long time ago
269+ # (libLLVM-11jl.so for julia 1.6 on freebsd)
270+ if [[ "${version}" == 1.6.* ]] && [[ "${target}" == *freebsd* ]]; then
271+ LDFLAGS="${LDFLAGS} -fuse-ld=bfd"
272+ fi
273+
268274 # avoid linker errors related to atomic support in 32bit ARM builds
269275 if [[ "${bb_full_target}" == armv7l-* ]]; then
270276 echo "MARCH=armv7-a" >>Make.user
@@ -394,17 +400,20 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
394400 push! (dependencies, Dependency (get_addable_spec (" LLVMLibUnwind_jll" , v " 12.0.1+0" ); platforms= filter (Sys. isapple, platforms)))
395401 push! (dependencies, BuildDependency (get_addable_spec (" LLVM_full_jll" , v " 15.0.7+8" )))
396402 elseif version. major == 1 && version. minor == 11
397- push! (dependencies, BuildDependency (get_addable_spec (" SuiteSparse_jll" , v " 7.2.0 +1" )))
403+ push! (dependencies, BuildDependency (get_addable_spec (" SuiteSparse_jll" , v " 7.2.1 +1" )))
398404 push! (dependencies, Dependency (get_addable_spec (" LibUV_jll" , v " 2.0.1+14" )))
399- push! (dependencies, Dependency (get_addable_spec (" LibUnwind_jll" , v " 1.5.0+5 " ); platforms= filter (! Sys. isapple, platforms)))
405+ push! (dependencies, Dependency (get_addable_spec (" LibUnwind_jll" , v " 1.7.2+2 " ); platforms= filter (! Sys. isapple, platforms)))
400406 push! (dependencies, Dependency (get_addable_spec (" LLVMLibUnwind_jll" , v " 12.0.1+0" ); platforms= filter (Sys. isapple, platforms)))
401- push! (dependencies, BuildDependency (get_addable_spec (" LLVM_full_jll" , v " 15.0.7+8 " )))
407+ push! (dependencies, BuildDependency (get_addable_spec (" LLVM_full_jll" , v " 15.0.7+9 " )))
402408 else
403409 error (" Unsupported Julia version" )
404410 end
405411
412+ # gcc 7 and gcc 8 crash on aarch64-linux when encountering some bfloat16 intrinsics
413+ gcc_ver = version >= v " 1.11.0-DEV" ? v " 9" : v " 7"
414+
406415 if any (should_build_platform .(triplet .(platforms)))
407416 build_tarballs (ARGS , name, jllversion, sources, script, platforms, products, dependencies;
408- preferred_gcc_version= v " 7 " , lock_microarchitecture= false , julia_compat= " 1.6" )
417+ preferred_gcc_version= gcc_ver , lock_microarchitecture= false , julia_compat= " 1.6" )
409418 end
410419end
0 commit comments