public/warp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request 'Adding support for aarch64 build and needed apple-darwin build options' (#2) from feature/adding_aarch64_support into develop

Browse Source 
Reviewed-on: #2
This commit is contained in:
David 2024-05-17 05:53:54 +02:00
commit 07a03cd110
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cargo/config.toml Normal file
View File

@ -0,0 +1,6 @@
[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
[target.x86_64-apple-darwin]
linker = "x86_64-apple-darwin16-clang"
ar = "x86_64-apple-darwin16-ar"

22
Makefile
View File

@ -2,20 +2,26 @@ all:
$(MAKE) build
build:
cargo build -p warp-runner --release --target x86_64-unknown-linux-musl
strip target/x86_64-unknown-linux-musl/release/warp-runner
cargo build -p warp-runner --release --target x86_64-unknown-linux-gnu
strip target/x86_64-unknown-linux-gnu/release/warp-runner
CC=x86_64-apple-darwin15-clang cargo build -p warp-runner --release --target x86_64-apple-darwin
x86_64-apple-darwin15-strip target/x86_64-apple-darwin/release/warp-runner
cargo build -p warp-runner --release --target aarch64-unknown-linux-gnu
aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/warp-runner
cargo build -p warp-runner --release --target x86_64-apple-darwin
x86_64-apple-darwin16-strip target/x86_64-apple-darwin/release/warp-runner
cargo build -p warp-runner --release --target x86_64-pc-windows-gnu
strip target/x86_64-pc-windows-gnu/release/warp-runner.exe
cargo build -p warp-packer --release --target x86_64-unknown-linux-musl
strip target/x86_64-unknown-linux-musl/release/warp-packer
cargo build -p warp-packer --release --target x86_64-unknown-linux-gnu
strip target/x86_64-unknown-linux-gnu/release/warp-packer
CC=x86_64-apple-darwin15-clang cargo build -p warp-packer --release --target x86_64-apple-darwin
x86_64-apple-darwin15-strip target/x86_64-apple-darwin/release/warp-packer
cargo build -p warp-packer --release --target aarch64-unknown-linux-gnu
aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/warp-packer
cargo build -p warp-packer --release --target x86_64-apple-darwin
x86_64-apple-darwin16-strip target/x86_64-apple-darwin/release/warp-packer
cargo build -p warp-packer --release --target x86_64-pc-windows-gnu
strip target/x86_64-pc-windows-gnu/release/warp-packer.exe

6
warp-packer/src/main.rs
View File

@ -22,7 +22,11 @@ lazy_static! {
let mut m = HashMap::new();
m.insert(
"linux-x64",
include_bytes!("../../target/x86_64-unknown-linux-musl/release/warp-runner").as_slice(),
include_bytes!("../../target/x86_64-unknown-linux-gnu/release/warp-runner").as_slice(),
);
m.insert(
"linux-aarch64",
include_bytes!("../../target/aarch64-unknown-linux-gnu/release/warp-runner").as_slice(),
);
m.insert(
"macos-x64",