Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
fingolfin committed Feb 18, 2022
1 parent aa02712 commit 2bf85c7
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions L/libjulia/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ function libjulia_platforms(julia_version)
return platforms
end

libjulia_platforms() = vcat(libjulia_platforms(v"1.6.0"), libjulia_platforms(v"1.7.0"))

# Collection of sources required to build Julia
function build_julia(ARGS, version::VersionNumber; jllversion=version)
name = "libjulia"
Expand All @@ -65,6 +63,14 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
ArchiveSource("https://github.com/JuliaLang/julia/releases/download/v$(version)/julia-$(version).tar.gz", checksums[version]),
DirectorySource("./bundled"),
]

if version == v"1.6.3"
# WORKAROUND
push!(sources, ArchiveSource("https://github.com/JuliaBinaryWrappers/LibOSXUnwind_jll.jl/releases/download/LibOSXUnwind-v0.0.7%2B0/LibOSXUnwind.v0.0.7.x86_64-apple-darwin.tar.gz",
"e2ea6ecae13c0f2666d1b3020098feeab92affae1614f6b2a992dde0af88ec2f",
unpack_target="LibOSXUnwind_jll"))
end

end

# Bash recipe for building across all platforms
Expand Down Expand Up @@ -321,7 +327,7 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
]
if version < v"1.5.1"
push!(dependencies, Dependency("LibOSXUnwind_jll", compat="0.0.5"))
elseif version < v"1.7"
elseif version < v"1.6"
push!(dependencies, BuildDependency(PackageSpec(; name="LibOSXUnwind_jll", version=v"0.0.6")))
end

Expand Down

0 comments on commit 2bf85c7

Please sign in to comment.