Skip to content

Commit

Permalink
Fix #1085 for real
Browse files Browse the repository at this point in the history
cross doesn't pass all environment variables through into the build
container, so JEMALLOC_SYS_WITH_LG_PAGE=16 wasn't being picked up from
the host.  Instead, set it explicitly in Cross.toml.

Link: https://github.com/cross-rs/cross/wiki/Configuration
  • Loading branch information
tavianator committed May 6, 2024
1 parent 8acd772 commit d7d63ed
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,7 @@ jobs:
- name: Build
shell: bash
run: |
case ${{ matrix.job.target }} in
aarch64-*) export JEMALLOC_SYS_WITH_LG_PAGE=16 ;;
esac;
$BUILD_CMD build --locked --release --target=${{ matrix.job.target }}
run: $BUILD_CMD build --locked --release --target=${{ matrix.job.target }}

- name: Set binary name & path
id: bin
Expand Down
6 changes: 6 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# https://github.com/sharkdp/fd/issues/1085
[target.aarch64-unknown-linux-gnu.env]
passthrough = ["JEMALLOC_SYS_WITH_LG_PAGE=16"]

[target.aarch64-unknown-linux-musl.env]
passthrough = ["JEMALLOC_SYS_WITH_LG_PAGE=16"]

0 comments on commit d7d63ed

Please sign in to comment.