Skip to content

Commit

Permalink
Merge pull request #213 from ikatson/x86_64-musl
Browse files Browse the repository at this point in the history
Switch x86_64 build to use musl
  • Loading branch information
ikatson authored Aug 26, 2024
2 parents 3042187 + c69da2d commit 113b048
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ jobs:
- name: install linux cross compiler
run: brew tap messense/macos-cross-toolchains &&
brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armv7-unknown-linux-musleabihf
brew install x86_64-unknown-linux-musl aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armv7-unknown-linux-musleabihf

- name: Build release linux x86_64 binary
run: rustup target install x86_64-unknown-linux-gnu &&
run: rustup target install x86_64-unknown-linux-musl &&
make release-linux-x86_64 &&
mv target/x86_64-unknown-linux-gnu/release-github/rqbit target/artifacts/rqbit-linux-static-x86_64
mv target/x86_64-unknown-linux-musl/release-github/rqbit target/artifacts/rqbit-linux-static-x86_64
- uses: softprops/action-gh-release@v1
with:
generate_release_notes: true
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ release-linux: release-linux-x86_64 release-linux-aarch64 release-linux-armv6 re

@PHONY: release-linux-x86_64
release-linux-x86_64:
TARGET=x86_64-unknown-linux-gnu \
TARGET_SNAKE_CASE=x86_64_unknown_linux_gnu \
TARGET_SNAKE_UPPER_CASE=X86_64_UNKNOWN_LINUX_GNU \
CROSS_COMPILE_PREFIX=x86_64-unknown-linux-gnu \
TARGET=x86_64-unknown-linux-musl \
TARGET_SNAKE_CASE=x86_64_unknown_linux_musl \
TARGET_SNAKE_UPPER_CASE=X86_64_UNKNOWN_LINUX_MUSL \
CROSS_COMPILE_PREFIX=x86_64-unknown-linux-musl \
$(MAKE) release-linux-current-target

@PHONY: release-linux-aarch64
Expand Down

0 comments on commit 113b048

Please sign in to comment.