diff --git a/Cargo.lock b/Cargo.lock index c7cab96..d73a2e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -858,7 +858,7 @@ dependencies = [ [[package]] name = "mdbook-angular" -version = "0.4.1" +version = "0.4.2" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index 7af96b7..56e84f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mdbook-angular" -version = "0.4.1" +version = "0.4.2" edition = "2021" authors = ["Bram Gotink "] license = "EUPL-1.2" diff --git a/scripts/ci/install-rust.sh b/scripts/ci/install-rust.sh index cfc6388..fe77b16 100755 --- a/scripts/ci/install-rust.sh +++ b/scripts/ci/install-rust.sh @@ -23,19 +23,18 @@ then rustup component add rust-std-$TARGET --toolchain=$TOOLCHAIN fi - case "$TARGET" in - aarch64-unknown-linux-musl) - MUSL_DOWNLOAD=https://musl.cc/aarch64-linux-musl-cross.tgz - ;; - x86_64-unknown-linux-musl) - MUSL_DOWNLOAD=https://musl.cc/x86_64-linux-musl-cross.tgz - sudo ln -s /usr/local/bin/{x86_64-linux-,}musl-gcc - ;; - esac - - if [ -n "$MUSL_DOWNLOAD" ] + if [[ $TARGET == *musl ]] + then + # This is needed by libdbus-sys. + sudo apt update -y && sudo apt install musl-dev musl-tools -y + fi + if [[ $TARGET == "aarch64-unknown-linux-musl" ]] then - curl -SsL "$MUSL_DOWNLOAD" | sudo tar -xvzC /usr/local --strip-components 1 + echo CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=rust-lld >> $GITHUB_ENV + # This `CC` is some nonsense needed for libdbus-sys (via opener). + # I don't know if this is really the right thing to do, but it seems to work. + sudo apt install gcc-aarch64-linux-gnu -y + echo CC=aarch64-linux-gnu-gcc >> $GITHUB_ENV fi fi diff --git a/scripts/ci/make-release-asset.sh b/scripts/ci/make-release-asset.sh index 3826e0d..f05b9b8 100755 --- a/scripts/ci/make-release-asset.sh +++ b/scripts/ci/make-release-asset.sh @@ -12,10 +12,6 @@ TAG=${GITHUB_REF#*/tags/} host=$(rustc -Vv | grep ^host: | sed -e "s/host: //g") target=$2 -if [ "$host" != "$target" ] -then - export "CARGO_TARGET_$(echo $target | tr a-z- A-Z_)_LINKER"=rust-lld -fi export CARGO_PROFILE_RELEASE_LTO=true cargo build --locked --bin mdbook-angular --release --target $target cd target/$target/release