Skip to content

Commit

Permalink
Merge pull request #2951 from authmillenon/make/enh/disable-actual
Browse files Browse the repository at this point in the history
make: actually disable a DISABLED_MODULE
  • Loading branch information
OlegHahm committed May 17, 2015
2 parents 287aa4c + bac1ac3 commit 12df25f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ ifneq (, $(filter all, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all)))
ifneq (, $(filter $(DISABLE_MODULE), $(USEMODULE)))
$(shell $(COLOR_ECHO) "$(COLOR_RED)Required modules were disabled using DISABLE_MODULE:$(COLOR_RESET)"\
"$(sort $(filter $(DISABLE_MODULE), $(USEMODULE)))" 1>&2)
USEMODULE := $(filter-out $(DISABLE_MODULE), $(USEMODULE))
EXPECT_ERRORS := 1
endif

Expand Down

0 comments on commit 12df25f

Please sign in to comment.