aboutsummaryrefslogtreecommitdiffstats
path: root/core/deps.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-09-24 17:46:32 +0200
committerLoïc Hoguin <[email protected]>2015-09-24 17:56:50 +0200
commit608f6a85ad68a7bbd9140fcd0258161689612df0 (patch)
treea2ec225d9c3eda38c77a8ffd805e05a1ad4f345f /core/deps.mk
parentdda1901dc7077ac4cf18d4d78b9e0cd548c85837 (diff)
downloaderlang.mk-608f6a85ad68a7bbd9140fcd0258161689612df0.tar.gz
erlang.mk-608f6a85ad68a7bbd9140fcd0258161689612df0.tar.bz2
erlang.mk-608f6a85ad68a7bbd9140fcd0258161689612df0.zip
Add tests for IGNORE_DEPS
Fix IGNORE_DEPS not being propagated downward. Fix IGNORE_DEPS handling with autopatched Rebar projects, where the user defined value was overriden with the one from autopatching.
Diffstat (limited to 'core/deps.mk')
-rw-r--r--core/deps.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk
index 91c42f9..814e7db 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -6,6 +6,7 @@
# Configuration.
IGNORE_DEPS ?=
+export IGNORE_DEPS
DEPS_DIR ?= $(CURDIR)/deps
export DEPS_DIR
@@ -160,7 +161,7 @@ define dep_autopatch_rebar.erl
Escape = fun (Text) ->
re:replace(Text, "\\\\$$$$", "\$$$$$$$$", [global, {return, list}])
end,
- Write("IGNORE_DEPS = edown eper eunit_formatters meck node_package "
+ Write("IGNORE_DEPS += edown eper eunit_formatters meck node_package "
"rebar_lock_deps_plugin rebar_vsn_plugin reltool_util\n"),
Write("C_SRC_DIR = /path/do/not/exist\n"),
Write("DRV_CFLAGS = -fPIC\nexport DRV_CFLAGS\n"),