diff options
| -rw-r--r-- | src/rebar_port_compiler.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 19c6f79..e442061 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -116,7 +116,8 @@ compile(Config, AppFile) -> %% and list of new binaries lists:foreach( fun({SoName,Bins}) -> - AllBins = [sets:from_list(Bins), sets:from_list(NewBins)], + AllBins = [sets:from_list(Bins), + sets:from_list(NewBins)], Intersection = sets:intersection(AllBins), case needs_link(SoName, sets:to_list(Intersection)) of true -> @@ -274,16 +275,17 @@ compiler(_) -> "$CC". %% apply_defaults(Vars, Defaults) -> dict:to_list( - dict:merge(fun(Key, VarValue, DefaultValue) -> - case is_expandable(DefaultValue) of + dict:merge(fun(Key, VarValue, DefaultValue) -> + case is_expandable(DefaultValue) of true -> expand_env_variable(DefaultValue, Key, VarValue); false -> VarValue - end - end, - dict:from_list(Vars), - dict:from_list(Defaults))). + end + end, + dict:from_list(Vars), + dict:from_list(Defaults))). + %% %% Given a list of {Key, Value} environment variables, where Key may be defined %% multiple times, walk the list and expand each self-reference so that we @@ -340,7 +342,6 @@ expand_vars(Key, Value, Vars) -> end, [], Vars). - %% %% Given a string, determine if it is expandable %% @@ -350,7 +351,6 @@ is_expandable(InStr) -> nomatch -> false end. - %% %% Given env. variable FOO we want to expand all references to %% it in InStr. References can have two forms: $FOO and ${FOO} |