Skip to content

Commit

Permalink
libcxxwrap_julia: switch to libjulia
Browse files Browse the repository at this point in the history
Also drop the restriction to the cxx11 ABI and add more platforms.
  • Loading branch information
fingolfin committed Oct 21, 2020
1 parent 3acb221 commit 87b33e0
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions L/libcxxwrap_julia/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,12 @@ install_license $WORKSPACE/srcdir/libcxxwrap-julia*/LICENSE.md

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = [
FreeBSD(:x86_64; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
Linux(:armv7l; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
Linux(:aarch64; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
Linux(:x86_64; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
Linux(:i686; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
MacOS(:x86_64; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
Windows(:x86_64; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
Windows(:i686; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)),
]
platforms = supported_platforms()
# in Julia <= 1.4 skip all musl builds
filter!(p -> !(Sys.islinux(p) && libc(p) == "musl"), platforms)
# in Julia <= 1.4 skip 32bit ARM builds
filter!(p -> !(Sys.islinux(p) && arch(p) == "armv7l"), platforms)
platforms = expand_cxxstring_abis(platforms)

# The products that we will ensure are always built
products = [
Expand All @@ -44,7 +40,7 @@ products = [

# Dependencies that must be installed before this package can be built
dependencies = [
BuildDependency(PackageSpec(name="Julia_jll",version=v"1.4.1"))
BuildDependency(PackageSpec(name="libjulia_jll", version=v"1.4.2"))
]

# Build the tarballs, and possibly a `build.jl` as well.
Expand Down

0 comments on commit 87b33e0

Please sign in to comment.