From 0218783f9a5ca81f6a5296073f6a61029de74fc0 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Sun, 9 Jul 2023 16:12:11 -0400 Subject: [PATCH] Set up raspberry pi cross-compile tools --- .cargo/config.toml | 4 ++++ emseries/Cargo.lock | 2 +- flake.nix | 5 +++++ rust-toolchain | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..a4455de --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,4 @@ +[target.arm-unknown-linux-gnueabihf] +linker = "armv6l-unknown-linux-gnueabihf-gcc" +# rustflags = ["-C", "link-arg=-Wl,-dynamic-linker,/lib/ld-linux-armhf.so.3"] + diff --git a/emseries/Cargo.lock b/emseries/Cargo.lock index 4435e02..cc38833 100644 --- a/emseries/Cargo.lock +++ b/emseries/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "emseries" -version = "0.5.1" +version = "0.6.0" dependencies = [ "chrono", "chrono-tz", diff --git a/flake.nix b/flake.nix index 520c854..67b3eaa 100644 --- a/flake.nix +++ b/flake.nix @@ -19,10 +19,15 @@ pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs-unstable = import unstable { system = "x86_64-linux"; }; cargo2nix = pkgs-cargo2nix.packages."x86_64-linux"; + armPkgs = import nixpkgs { + system = "x86_64-linux"; + crossSystem = pkgs.lib.systems.examples.raspberryPi; + }; in pkgs.mkShell { name = "ld-tools-devshell"; buildInputs = [ + armPkgs.stdenv.cc pkgs.clang pkgs.entr pkgs.glade diff --git a/rust-toolchain b/rust-toolchain index 6d69e1e..86abadf 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] channel = "1.68.2" -targets = [ "wasm32-unknown-unknown" ] +targets = [ "wasm32-unknown-unknown", "arm-unknown-linux-gnueabihf" ]