jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-18 20:20:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: pass sccache variables to cross container with build.env.passthrough

Browse Source
This commit is contained in:
Maxim De Clercq 2022-01-23 17:38:13 +01:00
parent 219dfbabd5
commit c2ad2b3dd7
No known key found for this signature in database
GPG Key ID: D35643779C52BA70
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cross.toml
View File

@ -1,3 +1,15 @@
[build.env]
# CI uses an S3 endpoint to store sccache artifacts, so their config needs to
# be available in the cross container as well
passthrough = [
"RUSTC_WRAPPER",
"AWS_ACCESS_KEY_ID",
"AWS_SECRET_ACCESS_KEY",
"SCCACHE_BUCKET",
"SCCACHE_ENDPOINT",
"SCCACHE_S3_USE_SSL",
]
[target.aarch64-unknown-linux-musl] [target.aarch64-unknown-linux-musl]
image = "rust-cross:aarch64-unknown-linux-musl" image = "rust-cross:aarch64-unknown-linux-musl"

3
cross/build.sh
View File

@ -22,9 +22,6 @@ $([[ $TARGET =~ arm ]] && echo 'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-lgcc -Clin
# Strip symbols while compiling in release mode # Strip symbols while compiling in release mode
$([[ $@ =~ -r ]] && echo 'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-s"') $([[ $@ =~ -r ]] && echo 'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-s"')
# Support a rustc wrapper like sccache when cross-compiling
ENV RUSTC_WRAPPER="$RUSTC_WRAPPER"
# Make sure that rust-bindgen uses the correct include path when cross-compiling # Make sure that rust-bindgen uses the correct include path when cross-compiling
# See https://github.com/rust-lang/rust-bindgen#environment-variables for more information # See https://github.com/rust-lang/rust-bindgen#environment-variables for more information
ENV BINDGEN_EXTRA_CLANG_ARGS="-I\$TARGET_PREFIX/include" ENV BINDGEN_EXTRA_CLANG_ARGS="-I\$TARGET_PREFIX/include"