diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2012-04-17 16:46:59 +0200 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2012-04-23 23:14:03 +0200 |
| commit | dc472bd958dac5823872007ff569886138623284 (patch) | |
| tree | e3c7e8dd8d46cd37b66d6d0d4f083811caf139a0 /src | |
| parent | b2fdce887911d14af7063317ef118680a2754048 (diff) | |
Do not use inherited port options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_port_compiler.erl | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 612ae26..65106d9 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -247,7 +247,7 @@ needs_link(SoName, NewBins) -> %% get_specs(Config, AppFile) -> - case rebar_config:get(Config, port_specs, undefined) of + case rebar_config:get_local(Config, port_specs, undefined) of undefined -> %% TODO: DEPRECATED: remove support for non-port_specs syntax {old, old_get_specs(Config, AppFile)}; @@ -314,24 +314,25 @@ old_get_specs(Config, AppFile) -> OsType = os:type(), SourceFiles = old_get_sources(Config), Specs = - case rebar_config:get(Config, so_specs, undefined) of + case rebar_config:get_local(Config, so_specs, undefined) of undefined -> Objects = port_objects(SourceFiles), %% New form of so_specs is not provided. See if the old form %% of {so_name} is available instead Dir = "priv", - SoName = case rebar_config:get(Config, so_name, undefined) of - undefined -> - %% Ok, neither old nor new form is - %% available. Use the app name and - %% generate a sensible default. - AppName = rebar_app_utils:app_name(AppFile), - DrvName = ?FMT("~s_drv.so", [AppName]), - filename:join([Dir, DrvName]); - AName -> - %% Old form is available -- use it - filename:join(Dir, AName) - end, + SoName = + case rebar_config:get_local(Config, so_name, undefined) of + undefined -> + %% Ok, neither old nor new form is + %% available. Use the app name and + %% generate a sensible default. + AppName = rebar_app_utils:app_name(AppFile), + DrvName = ?FMT("~s_drv.so", [AppName]), + filename:join([Dir, DrvName]); + AName -> + %% Old form is available -- use it + filename:join(Dir, AName) + end, [old_get_so_spec({SoName, Objects}, OsType)]; SoSpecs -> [old_get_so_spec(S, OsType) || S <- SoSpecs] @@ -339,8 +340,8 @@ old_get_specs(Config, AppFile) -> {SourceFiles, Specs}. old_get_sources(Config) -> - RawSources = rebar_config:get_list(Config, port_sources, - ["c_src/*.c"]), + RawSources = rebar_config:get_local(Config, port_sources, + ["c_src/*.c"]), FilteredSources = old_filter_port_sources(RawSources), old_expand_sources(FilteredSources). |