From ae32d9da65a6b7e18e2aa7361fe4dccfe917bfcb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 10 Mar 2024 16:10:19 +0100 Subject: [PATCH] buildsys: drop odd cargo/rustc overrides those should not be required for a functioning build.. Signed-off-by: Thomas Lamprecht --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 51d5f93..c2ae43a 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,7 @@ DSC=$(PACKAGE)_$(DEB_VERSION).dsc BINARY = $(COMPILEDIR)/esxi-folder-fuse SCRIPT = listvms.py -CARGO := /usr/bin/cargo -RUSTC := /usr/bin/rustc +CARGO ?= cargo .PHONY: all all: $(BINARY) @@ -69,7 +68,7 @@ deb: $(OUTPUT_DIR)$(DEB_DBGSYM): $(OUTPUT_DIR)$(DEB) $(OUTPUT_DIR)$(DEB): $(BUILD_DIR) - cd $(BUILD_DIR) && CARGO=$(CARGO) RUSTC=$(RUSTC) dpkg-buildpackage -b -uc -us + cd $(BUILD_DIR) && dpkg-buildpackage -b -uc -us lintian $@ .PHONY: dsc @@ -79,7 +78,7 @@ dsc: lintian $(OUTPUT_DIR)$(DSC) $(OUTPUT_DIR)$(DSC): $(BUILD_DIR) - cd $(BUILD_DIR) && CARGO=$(CARGO) RUSTC=$(RUSTC) dpkg-buildpackage -S -uc -us + cd $(BUILD_DIR) && dpkg-buildpackage -S -uc -us sbuild: $(OUTPUT_DIR)$(DSC) [ -z "$(OUTPUT_DIR)" ] || cd $(OUTPUT_DIR); sbuild $(DSC) -- 2.39.5