diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2014-02-25 21:33:35 +0100 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2014-03-05 20:16:15 +0100 |
| commit | 03fe5318c6cdc0a9eb1c0a9ee9d9267791ca4dda (patch) | |
| tree | d07216fc4c7733b0ec19399429673bb14d70d11a | |
| parent | c26b0c7d6b524289047c9a420d28bc1ab2110310 (diff) | |
Fix #220 (Reported-by: Joseph Norton)
When running 'rebar qc' or 'rebar eunit', we were erroneously fetching
erl_opts more than once.
| -rw-r--r-- | src/rebar_erlc_compiler.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl index 9e41f2e..75d47fb 100644 --- a/src/rebar_erlc_compiler.erl +++ b/src/rebar_erlc_compiler.erl @@ -173,7 +173,7 @@ test_compile(Config, Cmd, OutDir) -> %% with appropriate defines for eunit, and include all the test modules %% as well. ok = doterl_compile(test_compile_config(Config, ErlOpts, Cmd), - OutDir, TestErls), + OutDir, TestErls, ErlOpts), {ok, SrcErls}. @@ -272,11 +272,11 @@ is_lib_avail(Config, DictKey, Mod, Hrl, Name) -> -spec doterl_compile(rebar_config:config(), file:filename()) -> 'ok'. doterl_compile(Config, OutDir) -> - doterl_compile(Config, OutDir, []). + ErlOpts = rebar_utils:erl_opts(Config), + doterl_compile(Config, OutDir, [], ErlOpts). -doterl_compile(Config, OutDir, MoreSources) -> +doterl_compile(Config, OutDir, MoreSources, ErlOpts) -> ErlFirstFiles = rebar_config:get_list(Config, erl_first_files, []), - ErlOpts = rebar_utils:erl_opts(Config), ?DEBUG("erl_opts ~p~n", [ErlOpts]), %% Support the src_dirs option allowing multiple directories to %% contain erlang source. This might be used, for example, should |