diff options
| author | Jake Goulding <jake.goulding@gmail.com> | 2020-09-27 13:27:29 -0400 |
|---|---|---|
| committer | Jake Goulding <jake.goulding@gmail.com> | 2020-10-12 16:36:46 -0400 |
| commit | eb0c996ee26880163896b32d0a4a8ff1f5221123 (patch) | |
| tree | 6372a81995b97beac578980c25a7404009bdb427 | |
| parent | 5ae5b0e79035a2f858a22536156e1f9eb4b59cad (diff) | |
| download | rust-eb0c996ee26880163896b32d0a4a8ff1f5221123.tar.gz rust-eb0c996ee26880163896b32d0a4a8ff1f5221123.zip | |
Configure jemalloc for cross-compilation to aarch64-apple-darwin
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d225a73776..828a3bc71b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -315,6 +315,7 @@ jobs: NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 DIST_REQUIRE_ALL_TOOLS: 1 + JEMALLOC_SYS_WITH_LG_PAGE: 14 os: macos-latest - name: x86_64-msvc-1 env: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 2ce0093079c..090b06f2a0a 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -482,6 +482,14 @@ jobs: NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 DIST_REQUIRE_ALL_TOOLS: 1 + # Corresponds to 16K page size + # + # Shouldn't be needed if jemalloc-sys is updated to + # handle this platform like iOS or if we build on + # aarch64-apple-darwin itself. + # + # https://github.com/gnzlbg/jemallocator/blob/c27a859e98e3cb790dc269773d9da71a1e918458/jemalloc-sys/build.rs#L237 + JEMALLOC_SYS_WITH_LG_PAGE: 14 <<: *job-macos-xl ###################### |