diff options
| author | Loïc Hoguin <[email protected]> | 2016-03-19 12:29:49 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2016-03-19 12:29:49 +0100 |
| commit | 12e5c5f57def8fd137f680051be20dd33332595f (patch) | |
| tree | 0f27226a629a36124204a8b68d1cadd9fc2d358b | |
| parent | ac9a8b47531071cfa908b1538a5b26cbf6e16d9d (diff) | |
| parent | 9a90461dbcdc5406ba0936e07d13bb76ad12cb00 (diff) | |
| download | erlang.mk-12e5c5f57def8fd137f680051be20dd33332595f.tar.gz erlang.mk-12e5c5f57def8fd137f680051be20dd33332595f.tar.bz2 erlang.mk-12e5c5f57def8fd137f680051be20dd33332595f.zip | |
Merge branch 'erlc-opts-sed' of https://github.com/Gatzy118/erlang.mk
| -rw-r--r-- | core/compat.mk | 2 | ||||
| -rw-r--r-- | test/core_compat.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/compat.mk b/core/compat.mk index 239bc1c..eff4915 100644 --- a/core/compat.mk +++ b/core/compat.mk @@ -6,7 +6,7 @@ # We strip out -Werror because we don't want to fail due to # warnings when used as a dependency. -compat_prepare_erlc_opts = $(shell echo "$1" | sed 's/, */,/') +compat_prepare_erlc_opts = $(shell echo "$1" | sed 's/, */,/g') define compat_convert_erlc_opts $(if $(filter-out -Werror,$1),\ diff --git a/test/core_compat.mk b/test/core_compat.mk index ea994f5..8d6cabc 100644 --- a/test/core_compat.mk +++ b/test/core_compat.mk @@ -253,7 +253,7 @@ core-compat-rebar-pt: build clean $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile $i "Add the lager_transform parse_transform to ERLC_OPTS" - $t echo "ERLC_OPTS += +'{parse_transform, lager_transform}'" >> $(APP)/Makefile + $t echo "ERLC_OPTS += +'{parse_transform, lager_transform}' +'{lager_truncation_size, 1234}'" >> $(APP)/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v @@ -269,6 +269,7 @@ core-compat-rebar-pt: build clean {ok, C} = file:consult(\"$(APP)/rebar.config\"), \ {_, Opts} = lists:keyfind(erl_opts, 1, C), \ true = lists:member({parse_transform, lager_transform}, Opts), \ + true = lists:member({lager_truncation_size, 1234}, Opts), \ halt()" # For the new build method, we have to simulate keeping the .app file |