From 50b0613f5cca1fdca643c5930a39638bd641ae1d Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sun, 20 Sep 2020 20:07:12 +0300
Subject: [PATCH] Use rust-objcopy tool

Since cargo-binutils 0.3.1 the `cargo objcopy` causes a build before
copying files, this doesn't work for test-runner.
We only need the actual objcopy tool, not the cargo infra here.
---
 Makefile.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.toml b/Makefile.toml
index 0cef496..642adf0 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -17,8 +17,8 @@ BUILD_STD = "-Zbuild-std=core,compiler_builtins,alloc"
 DEVICE_FEATURES = "noserial"
 QEMU_FEATURES = "qemu"
 
-OBJCOPY = "cargo objcopy"
-OBJCOPY_PARAMS = "-- --strip-all -O binary"
+OBJCOPY = "rust-objcopy" # Part of `cargo objcopy` in cargo-binutils
+OBJCOPY_PARAMS = "--strip-all -O binary"
 
 UTILS_CONTAINER = "andrerichter/raspi3-utils"
 DOCKER_CMD = "docker run -it --rm -v ${PWD}:/work -w /work -p 5900:5900"