From ad7d488d42b1e03a5e240ba0b014a28b4c4a0dbf Mon Sep 17 00:00:00 2001 From: mwojcik Date: Tue, 5 Oct 2021 11:55:45 +0200 Subject: [PATCH] make: change main target names to avoid collision --- default.nix | 2 +- src/Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index cb28ac1..d4f9532 100644 --- a/default.nix +++ b/default.nix @@ -35,7 +35,7 @@ let export XARGO_RUST_SRC="${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library" export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include" export CARGO_HOME=$(mktemp -d cargo-home.XXX) - make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype} + make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}_target ''; installPhase = '' diff --git a/src/Makefile b/src/Makefile index 86e1069..ab61d93 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,18 +3,18 @@ GWARGS := -V simple all: runtime -runtime: ../build/runtime.bin +runtime_target: ../build/runtime.bin -satman: ../build/satman.bin +satman_target: ../build/satman.bin .PHONY: all -../build/pl.rs ../build/rustc-cfg: gateware/* +../build/pl.rs ../build/rustc-cfg ../build/mem.rs: gateware/* mkdir -p ../build python gateware/$(TARGET).py -r ../build/pl.rs -c ../build/rustc-cfg -m ../build/mem.rs $(GWARGS) -../build/firmware/armv7-none-eabihf/release/runtime: ../build/pl.rs ../build/rustc-cfg +../build/firmware/armv7-none-eabihf/release/runtime: ../build/pl.rs ../build/rustc-cfg ../build/mem.rs $(shell find . -print) cd runtime && \ XBUILD_SYSROOT_PATH=`pwd`/../../build/sysroot \ cargo xbuild --release \ @@ -24,7 +24,7 @@ satman: ../build/satman.bin ../build/runtime.bin: ../build/firmware/armv7-none-eabihf/release/runtime llvm-objcopy -O binary ../build/firmware/armv7-none-eabihf/release/runtime ../build/runtime.bin -../build/firmware/armv7-none-eabihf/release/satman: ../build/pl.rs ../build/rustc-cfg +../build/firmware/armv7-none-eabihf/release/satman: ../build/pl.rs ../build/rustc-cfg ../build/mem.rs $(shell find . -print) cd satman && \ XBUILD_SYSROOT_PATH=`pwd`/../../build/sysroot \ cargo xbuild --release \