summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuncer Ayaz <tuncer.ayaz@gmail.com>2012-06-23 22:04:58 +0200
committerTuncer Ayaz <tuncer.ayaz@gmail.com>2012-06-23 22:05:43 +0200
commit4e9e89bd0dad9cee2792b5ae7d2cc53046e167d2 (patch)
tree71c7972ed01f99714786135d9fe564ec72401d1e
parentc41fda6a2fdcdc492c2f6f319e2a5fae3f39031c (diff)
Append os family to arch string
-rw-r--r--dialyzer_reference2
-rw-r--r--src/rebar_utils.erl7
2 files changed, 7 insertions, 2 deletions
diff --git a/dialyzer_reference b/dialyzer_reference
index fd49b6a..bd0a37d 100644
--- a/dialyzer_reference
+++ b/dialyzer_reference
@@ -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
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 30e8621..ec816b8 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -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 ->