diff options
| author | Cliff Moon <cliff@moonpolysoft.com> | 2010-04-28 19:37:46 -0700 |
|---|---|---|
| committer | Cliff Moon <cliff@moonpolysoft.com> | 2010-04-28 19:37:46 -0700 |
| commit | 939c36e527344a36450f0e1627907f674d6b448e (patch) | |
| tree | 9d747f3fca53c1f13bbb7e315abd8d98b03918ef /src/rebar_port_compiler.erl | |
| parent | c3fe43a0ba1af0ee9172239be0a44662fa392984 (diff) | |
| parent | c28a16258cec1fac8471793b33f4183fa8f07df1 (diff) | |
merged from basho
Diffstat (limited to 'src/rebar_port_compiler.erl')
| -rw-r--r-- | src/rebar_port_compiler.erl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 1a72d16..213f3d0 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -310,7 +310,8 @@ os_env() -> [list_to_tuple(re:split(S, "=", [{return, list}, {parts, 2}])) || S <- os:getenv()]. default_env() -> - [{"CC", "gcc"}, + [ + {"CC", "gcc"}, {"CXX", "g++"}, {"ERL_CFLAGS", lists:concat([" -I", code:lib_dir(erl_interface, include), " -I", filename:join(erts_dir(), include), @@ -321,7 +322,17 @@ default_env() -> {"DRV_LDFLAGS", "-shared $ERL_LDFLAGS"}, {"darwin", "DRV_LDFLAGS", "-bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"}, {"ERLANG_ARCH", integer_to_list(8 * erlang:system_info(wordsize))}, - {"ERLANG_TARGET", rebar_utils:get_arch()}]. + {"ERLANG_TARGET", rebar_utils:get_arch()}, + + {"solaris.*-64$", "CFLAGS", "-D_REENTRANT -m64"}, % Solaris specific flags + {"solaris.*-64$", "LDFLAGS", "-m64"}, + + {"darwin9.*-64$", "CFLAGS", "-m64"}, % OS X Leopard flags for 64-bit + {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"}, + + {"darwin10.*-32", "CFLAGS", "-m32"}, % OS X Snow Leopard flags for 32-bit + {"darwin10.*-32", "LDFLAGS", "-arch i386"} + ]. |