Skip to content

Commit

Permalink
Bump rr (#5202)
Browse files Browse the repository at this point in the history
* Bump rr

Includes an assortment of fixes we've seen for rr CI issues, but does not yet include the big syscallbuf refactor that is currently pending, so this should be relatively safe to do.

* Let's try the aarch64 build also to see what happens

* Drop aarch64 march

* Try gcc 10 for `-moutline-atomics`

* Split capnproto dependency, fix aarch64 errors
  • Loading branch information
Keno authored Jul 22, 2022
1 parent fc3f025 commit b52ac5a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions R/rr/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = v"5.5"
# Collection of sources required to build rr
sources = [
GitSource("https://github.com/Keno/rr.git",
"c0aa7577800aa43333c4de05d7832f780511a467")
"fa6a8da4ecdb20909af13ac8380b7a1d804c71e2")
]

# Bash recipe for building across all platforms
Expand All @@ -29,6 +29,7 @@ make install
# rr only supports Linux
platforms = [
Platform("x86_64", "linux", libc="glibc"),
Platform("aarch64", "linux", libc="glibc")
]
platforms = expand_cxxstring_abis(platforms)

Expand All @@ -40,11 +41,14 @@ products = [
# Dependencies that must be installed before this package can be built
# This is really a build dependency
dependencies = [
# For the capnp generator executable
HostBuildDependency("capnproto_jll"),
# For the capnp static support library
BuildDependency("capnproto_jll"),
Dependency("Zlib_jll"),
Dependency("CompilerSupportLibraries_jll"),
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies,
preferred_gcc_version=v"8")
preferred_gcc_version=v"10")

0 comments on commit b52ac5a

Please sign in to comment.