diff options
| -rw-r--r-- | src/rebar_config.erl | 2 | ||||
| -rw-r--r-- | src/rebar_erlc_compiler.erl | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 58b2c4d..c858fef 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -69,7 +69,7 @@ merge_locks(Config, [[]]) -> Config; %% lockfile with entries merge_locks(Config, [Locks]) -> - {deps, ConfigDeps} = lists:keyfind(deps, 1, Config), + ConfigDeps = proplists:get_value(deps, Config, []), %% We want the top level deps only from the lock file. %% This ensures deterministic overrides for configs. %% Then check if any new deps have been added to the config diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl index f906463..862d21e 100644 --- a/src/rebar_erlc_compiler.erl +++ b/src/rebar_erlc_compiler.erl @@ -541,9 +541,6 @@ maybe_expand_include_lib_path(File, Dir) -> %% The use of -include_lib was probably incorrect by the user but lets try to make it work. %% We search in the outdir and outdir/../include to see if the header exists. warn_and_find_path(File, Dir) -> - ?WARN("Bad use of -include_lib(\"~s\")." - " First path component should be the name of an application." - " You probably meant -include(\"~s\").", [File, File]), SrcHeader = filename:join(Dir, File), case filelib:is_regular(SrcHeader) of true -> @@ -555,7 +552,6 @@ warn_and_find_path(File, Dir) -> true -> [filename:join(IncludeDir, File)]; false -> - ?WARN("Could not find header for -include_lib(\"~s\").", [File]), [] end end. |