Browse Source

Append os family to arch string

pull/3/head
Tuncer Ayaz 13 years ago
parent
commit
4e9e89bd0d
2 changed files with 7 additions and 2 deletions
  1. +1
    -1
      dialyzer_reference
  2. +6
    -1
      src/rebar_utils.erl

+ 1
- 1
dialyzer_reference View File

@ -1,2 +1,2 @@
rebar_utils.erl:158: Call to missing or unexported function escript:foldl/3
rebar_utils.erl:159: Call to missing or unexported function escript:foldl/3

+ 6
- 1
src/rebar_utils.erl View File

@ -71,7 +71,8 @@ is_arch(ArchRegex) ->
get_arch() ->
Words = wordsize(),
erlang:system_info(otp_release) ++ "-"
++ erlang:system_info(system_architecture) ++ "-" ++ Words.
++ erlang:system_info(system_architecture) ++ "-" ++ Words
++ "-" ++ os_family().
wordsize() ->
try erlang:system_info({wordsize, external}) of
@ -284,6 +285,10 @@ delayed_halt(Code) ->
%% Internal functions
%% ====================================================================
os_family() ->
{OsFamily, _} = os:type(),
atom_to_list(OsFamily).
get_deprecated_3(Get, Config, OldOpt, NewOpt, Default, When) ->
case Get(Config, NewOpt, Default) of
Default ->

Loading…
Cancel
Save