diff --git a/Makefile.in b/Makefile.in index ba09c011..5fecdfd3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,6 +7,7 @@ OBJ := $(abspath $(CURDIR)) ifeq ($(filter s,$(MAKEFLAGS)),s) MAKEFLAGS += --quiet --no-print-directory --quiet? := --quiet +CARGO_BUILD_ARGS := --quiet else MFLAGS += V=1 VERBOSE=1 -v? := -v @@ -56,7 +57,11 @@ DEBUG_FLAGS := -ggdb -ffunction-sections -fdata-sections -fno-omit-frame-poin COMMON_FLAGS = $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(SANITY_FLAGS) -ffile-prefix-map=$(CCACHE_BASEDIR)=. COMMON_FLAGS32 := -mstackrealign COMMON_FLAGS64 := -mcmodel=small -CARGO_BUILD_ARG := --release +CARGO_BUILD_ARGS += --release + +ifneq ($(SUPPRESS_WARNINGS),) + COMMON_FLAGS += -w +endif $(DST_DIR): mkdir -p $@ diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk index ea76678b..d80ff9ed 100644 --- a/make/rules-cargo.mk +++ b/make/rules-cargo.mk @@ -17,7 +17,7 @@ $$(OBJ)/.$(1)-build$(3): $$(filter -j%,$$(MAKEFLAGS)) \ --target "$$(CARGO_TARGET_$(3))" \ --target-dir $$($(2)_OBJ$(3)) \ - $$(CARGO_BUILD_ARG) \ + $$(CARGO_BUILD_ARGS) \ $$($(2)_CARGO_ARGS) \ $$($(2)_CARGO_ARGS$(3)) touch $$@