github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-12-18 11:06:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from tuncer/ta-old-arch_string

Browse source 
Revert arch string changes
This commit is contained in:
Dave Smith 2012-10-29 08:56:37 -07:00
commit fa5c8f44ac
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dialyzer_reference
View file

@ -1,3 +1,3 @@
rebar_eunit.erl:351: Call to missing or unexported function eunit_test:function_wrapper/2 rebar_eunit.erl:351: Call to missing or unexported function eunit_test:function_wrapper/2
rebar_utils.erl:163: Call to missing or unexported function escript:foldl/3 rebar_utils.erl:162: Call to missing or unexported function escript:foldl/3

7
src/rebar_utils.erl
View file

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