From 268405d0dc49d6a0a2d0ea41014b045b3ff26eb0 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Wed, 10 Feb 2010 11:15:55 -0700 Subject: Adding new vars for scripts to determine architecture (32/64 bit) and target platform of Erlang VM; courtesy of rtilder --- src/rebar_port_compiler.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/rebar_port_compiler.erl') diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index a347cb7..2f419c9 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -253,7 +253,9 @@ default_env() -> " -I", filename:join(erts_dir(), include), " "])}, {"DRIVER_LDFLAGS", lists:concat([" -L", code:lib_dir(erl_interface, lib), - " -lerl_interface -lei"])}]. + " -lerl_interface -lei"])}, + {"ERLANG_ARCH", 8 * erlang:system_info(wordsize)}, + {"ERLANG_TARGET", erlang:system_info(system_architecture)}]. -- cgit v1.1 From f502bb09dd041cdc8a524e82c482e820c169fa65 Mon Sep 17 00:00:00 2001 From: Ryan Tilder Date: Wed, 10 Feb 2010 11:23:53 -0800 Subject: I'm a moron. Make it a string. --- src/rebar_port_compiler.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_port_compiler.erl') diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 2f419c9..3cc8fc1 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -254,7 +254,7 @@ default_env() -> " "])}, {"DRIVER_LDFLAGS", lists:concat([" -L", code:lib_dir(erl_interface, lib), " -lerl_interface -lei"])}, - {"ERLANG_ARCH", 8 * erlang:system_info(wordsize)}, + {"ERLANG_ARCH", integer_to_list(8 * erlang:system_info(wordsize))}, {"ERLANG_TARGET", erlang:system_info(system_architecture)}]. -- cgit v1.1 From 96c1ceba6007551812add22d585f46256d78e106 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Fri, 12 Feb 2010 15:05:32 -0700 Subject: Break out arch string function; update ERLANG_TARGET to include bitness of the Erlang target --- src/rebar_port_compiler.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_port_compiler.erl') diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 3cc8fc1..b08a046 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -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()}]. -- cgit v1.1