From 3310c460ba65935928b911f157e213ed3b2a0524 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 14 Nov 2023 08:27:13 -0500 Subject: [PATCH] Cleanups --- .cargo/config.toml | 4 ---- Cargo.toml | 1 + flake.nix | 4 ---- rust-toolchain | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index a4455de..0000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,4 +0,0 @@ -[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/Cargo.toml b/Cargo.toml index 0df76ec..6c07497 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "changeset", "config", diff --git a/flake.nix b/flake.nix index e98c08b..bac9d63 100644 --- a/flake.nix +++ b/flake.nix @@ -19,10 +19,6 @@ 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"; diff --git a/rust-toolchain b/rust-toolchain index fe75ed3..3e044fb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] channel = "1.73.0" -targets = [ "wasm32-unknown-unknown", "thumbv6-none-eabi" ] +targets = [ "wasm32-unknown-unknown" ]