aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

snap: Fix build process for Tier 2 platforms

Browse Source 
Unfortunately this only actually *fixes* the build for arm64;
it seems that we hit various bugs in Rust on ppc64 and armhf.
This commit is contained in:
Christopher James Halse Rogers 2020-01-24 09:01:28 +02:00
parent 2a58835f92
commit adb5dac1d2
No known key found for this signature in database
GPG Key ID: D4DB4A9F5D044F1A
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
snap/snapcraft.yaml
View File

@ -31,21 +31,20 @@ parts:
- pkg-config - pkg-config
- libsqlite3-dev - libsqlite3-dev
- gettext - gettext
- libclang-8-dev - libclang-9-dev
- on arm64,armhf,ppc64el,s390x: - lld-9
- lld-8
override-build: | override-build: |
snapcraftctl set-version $(git describe --tags) snapcraftctl set-version $(git describe --tags)
export PATH=$PATH:$HOME/.cargo/bin export PATH=$PATH:$HOME/.cargo/bin
rustup install stable rustup install --force --profile=minimal stable
cargo +stable install --force cargo-web cargo +stable install --force cargo-web
# Only Tier 1 Rust platforms get rust-lld # Only Tier 1 Rust platforms get rust-lld
# On the others (arm64, armhf, powerpc64, s390x) fall back to using # On the others (arm64, armhf, powerpc64, s390x) fall back to using
# the system LLD we've installed earlier. # the system LLD we've installed earlier.
case ${SNAPCRAFT_ARCH_TRIPLET} in \ case ${SNAPCRAFT_ARCH_TRIPLET} in \
aarch64-linux-gnu|arm-linux-gnueabihf|powerpc64-linux-gnu|s390x-linux-gnu) \ aarch64-linux-gnu|arm-linux-gnueabihf|powerpc64le-linux-gnu|s390x-linux-gnu) \
RUSTFLAGS="-C linker=lld-8" cargo web deploy -p plume-front --release \ RUSTFLAGS="-C linker=lld-9" cargo web deploy -p plume-front --release \
;; \ ;; \
*) \ *) \
cargo web deploy -p plume-front --release \ cargo web deploy -p plume-front --release \