-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build x86-64 by default, fix make script to build for ARM
- Loading branch information
1 parent
dbd6063
commit a644620
Showing
2 changed files
with
4 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,3 @@ | ||
[build] | ||
target = "armv7-unknown-linux-gnueabihf" | ||
rustflags = ["-C", "target-feature=+crt-static"] | ||
|
||
[alias] | ||
test_pc = "test --target=x86_64-unknown-linux-gnu" | ||
build_pc = "build --target=x86_64-unknown-linux-gnu" | ||
|
||
|
||
[target.armv7-unknown-linux-gnueabihf] | ||
linker = "arm-linux-gnueabihf-gcc" | ||
rustflags = ["-C", "target-feature=+crt-static"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,4 @@ | ||
<<<<<<< Updated upstream | ||
cargo build --release | ||
adb push target/armv7-unknown-linux-gnueabihf/release/rayhunter /data/rayhunter/rayhunter | ||
#!/bin/sh | ||
cargo build --release --target="armv7-unknown-linux-gnueabihf" --bin rayhunter-daemon | ||
adb push target/armv7-unknown-linux-gnueabihf/release/rayhunter-daemon /data/rayhunter/ | ||
adb shell '/bin/rootshell -c "/etc/init.d/rayhunter_daemon restart"' | ||
======= | ||
# the "arm" profile inherits from "release", so this is an optimized build | ||
cargo build --profile arm | ||
adb push target/arm/rayhunter-daemon /data/rayhunter/ | ||
adb shell '/bin/rootshell -c "/etc/init.d/rayhunter_daemon restart"' | ||
>>>>>>> Stashed changes |