Merging w/ mainline

bootstrap

@@ -1,6 +1,6 @@
 #!/usr/bin/env escript
-%% vim: syntax=erlang:et:ts=4
-%% -*- erlang -*-
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ft=erlang ts=4 sw=4 et
 
 main(Args) ->
     %% Get a string repr of build time

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)}].