diff --git a/plugins/override_opts.erl b/plugins/override_opts.erl index 1d321fc87..818f53e87 100644 --- a/plugins/override_opts.erl +++ b/plugins/override_opts.erl @@ -9,6 +9,11 @@ override_opts(add, Config, Opts) -> lists:foldl(fun({Opt, Value}, Conf) -> V = rebar_config:get_local(Conf, Opt, []), rebar_config:set(Conf, Opt, V ++ Value) + end, Config, Opts); +override_opts(del, Config, Opts) -> + lists:foldl(fun({Opt, Value}, Conf) -> + V = rebar_config:get_local(Conf, Opt, []), + rebar_config:set(Conf, Opt, V -- Value) end, Config, Opts). preprocess(Config, _Dirs) -> @@ -24,6 +29,8 @@ preprocess(Config, _Dirs) -> lists:foldl(fun({Type, AppName2, Opts}, Conf1) when AppName2 == AppName -> override_opts(Type, Conf1, Opts); + ({Type, Opts}, Conf1a) -> + override_opts(Type, Conf1a, Opts); (_, Conf2) -> Conf2 end, C, TopOverrides); diff --git a/rebar.config b/rebar.config index acf3ebb02..08042444d 100644 --- a/rebar.config +++ b/rebar.config @@ -148,6 +148,9 @@ {cover_export_enabled, true}. {recursive_cmds, ['configure-deps']}. +{overrides, [ + {del, [{erl_opts, [warnings_as_errors]}]}]}. + {post_hook_configure, [{"fast_tls", []}, {"stringprep", []}, {"fast_yaml", []}, diff --git a/rebar.config.script b/rebar.config.script index 694d6879f..0023c25f3 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -299,7 +299,7 @@ fun(Hooks) -> lists:map(fun({Pkg, Flags}) -> DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"), Line = lists:flatten(GenDepConfigureLine(DepPath, Flags)), - {add, list_to_atom(Pkg), [{pre_hooks, [{'compile', Line}, {'configure-deps', Line}]}]} + {add, list_to_atom(Pkg), [{pre_hooks, [{{pc, compile}, Line}, {'compile', Line}, {'configure-deps', Line}]}]} end, Hooks) end,