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

Break out arch string function; update ERLANG_TARGET to include bitness of the Erlang target

Browse source
This commit is contained in:
Dave Smith 2010-02-12 15:05:32 -07:00
parent a0732e9e78
commit 96c1ceba60
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rebar_port_compiler.erl
View file

@ -255,7 +255,7 @@ default_env() ->
{"DRIVER_LDFLAGS", lists:concat([" -L", code:lib_dir(erl_interface, lib),
" -lerl_interface -lei"])},
{"ERLANG_ARCH", integer_to_list(8 * erlang:system_info(wordsize))},
{"ERLANG_TARGET", erlang:system_info(system_architecture)}].
{"ERLANG_TARGET", rebar_utils:get_arch()}].

9
src/rebar_utils.erl
View file

@ -28,6 +28,7 @@
-export([get_cwd/0,
is_arch/1,
get_arch/0,
get_os/0,
sh/2, sh/3,
sh_failfast/2,
@ -48,15 +49,17 @@ get_cwd() ->
is_arch(ArchRegex) ->
Words = integer_to_list(8 * erlang:system_info(wordsize)),
Arch = erlang:system_info(system_architecture) ++ "-" ++ Words,
case re:run(Arch, ArchRegex, [{capture, none}]) of
case re:run(get_arch(), ArchRegex, [{capture, none}]) of
match ->
true;
nomatch ->
false
end.
get_arch() ->
Words = integer_to_list(8 * erlang:system_info(wordsize)),
erlang:system_info(system_architecture) ++ "-" ++ Words.
get_os() ->
Arch = erlang:system_info(system_architecture),
case match_first([{"linux", linux}, {"darwin", darwin}], Arch) of