diff options
| author | Loïc Hoguin <[email protected]> | 2015-07-21 17:16:32 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-07-21 17:16:32 +0200 |
| commit | 26ea355c28f674b168259aadc6847d46fafb313a (patch) | |
| tree | 8323fb128447d623c9bf446034fba2c4cc8da298 /core | |
| parent | 56cbd9e0919b884025d9b21c4ad3de8bcc6fe573 (diff) | |
| download | erlang.mk-26ea355c28f674b168259aadc6847d46fafb313a.tar.gz erlang.mk-26ea355c28f674b168259aadc6847d46fafb313a.tar.bz2 erlang.mk-26ea355c28f674b168259aadc6847d46fafb313a.zip | |
Don't use warning_as_errors for erlang.mk-style deps
Fix a bug where deps that use erlang.mk didn't have the -Werror
option suppressed automatically.
Diffstat (limited to 'core')
| -rw-r--r-- | core/erlc.mk | 2 | ||||
| -rw-r--r-- | core/test.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index f6bd6fd..144b57b 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -93,7 +93,7 @@ erlc-include: fi define compile_erl - $(erlc_verbose) erlc -v $(ERLC_OPTS) -o ebin/ \ + $(erlc_verbose) erlc -v $(if $(IS_DEP),$(filter-out -Werror,$(ERLC_OPTS)),$(ERLC_OPTS)) -o ebin/ \ -pa ebin/ -I include/ $(filter-out $(ERLC_EXCLUDE_PATHS),\ $(COMPILE_FIRST_PATHS) $(1)) endef diff --git a/core/test.mk b/core/test.mk index acc792a..83bbecb 100644 --- a/core/test.mk +++ b/core/test.mk @@ -20,7 +20,7 @@ ifneq ($(SKIP_DEPS),) test-deps: else test-deps: $(ALL_TEST_DEPS_DIRS) - $(verbose) for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done + $(verbose) for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep IS_DEP=1; done endif ifneq ($(wildcard $(TEST_DIR)),) |