From 3b7aad39bfff0bb6f3517fd5d9d1ca652804840a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 18 Dec 2015 23:03:57 +0100 Subject: [PATCH] make: add CARGOFLAGS --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c36fbac71..0db41b849 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ endif # Binaries CARGO ?= cargo +CARGOFLAGS ?= # Install directories PREFIX ?= /usr/local @@ -161,12 +162,12 @@ TESTS := \ define BUILD_EXE build_exe_$(1): - ${CARGO} build ${PROFILE_CMD} -p $(1) + ${CARGO} build ${CARGOFLAGS} ${PROFILE_CMD} -p $(1) endef define TEST_INTEGRATION test_integration_$(1): build_exe_$(1) - ${CARGO} test --test $(1) --features $(1) --no-default-features + ${CARGO} test ${CARGOFLAGS} --test $(1) --features $(1) --no-default-features endef # Output names @@ -204,7 +205,7 @@ use_default := 1 $(foreach util,$(EXES),$(eval $(call BUILD_EXE,$(util)))) build-uutils: $(addprefix build_exe_,$(EXES)) - ${CARGO} build --features "${EXES}" ${PROFILE_CMD} --no-default-features + ${CARGO} build ${CARGOFLAGS} --features "${EXES}" ${PROFILE_CMD} --no-default-features build: build-uutils @@ -216,7 +217,7 @@ clean: $(RM) -rf $(BUILDDIR) distclean: clean - $(CARGO) clean && $(CARGO) update + $(CARGO) clean $(CARGOFLAGS) && $(CARGO) update $(CARGOFLAGS) # TODO: figure out if there is way for prefixes to work with the symlinks install: build