diff options
| author | Tony Rogvall <tony@rogvall.se> | 2015-02-05 15:11:14 +0100 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2015-07-02 13:47:40 +0200 |
| commit | 49fd99c7011191ae9fe499f03c8070faf0bb41ba (patch) | |
| tree | 5e49e743095e7af5546a6307d7081722e8fb0455 | |
| parent | 29447c760f388d0b5d288e10846129ace6e66f20 (diff) | |
| download | rebar-49fd99c7011191ae9fe499f03c8070faf0bb41ba.tar.gz | |
port_compiler: cross-arch rename variables
New variable names:
* REBAR_TARGET_ARCH
* REBAR_TARGET_ARCH_VSN
* REBAR_TARGET_ARCH_WORDSIZE
| -rw-r--r-- | src/rebar_port_compiler.erl | 4 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 1c24b2f..84cf49b 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -568,8 +568,8 @@ erl_interface_dir(Subdir) -> end. default_env() -> - Arch = os:getenv("REBAR_ARCH_TARGET"), - Vsn = os:getenv("REBAR_ARCH_TARGET_VSN"), + Arch = os:getenv("REBAR_TARGET_ARCH"), + Vsn = os:getenv("REBAR_TARGET_ARCH_VSN"), [ {"CC" , get_tool(Arch,Vsn,"gcc","cc")}, {"CXX", get_tool(Arch,Vsn,"g++","c++")}, diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 7321845..31ccb3f 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -98,13 +98,13 @@ is_arch(ArchRegex) -> false end. %% -%% REBAR_ARCH_TARGET, if used, should be set to the "standard" +%% REBAR_TARGET_ARCH, if used, should be set to the "standard" %% target string. That is a prefix for binutils tools. %% "x86_64-linux-gnu" or "arm-linux-gnueabi" are good candiates -%% ${REBAR_ARCH_TARGET}-gcc, ${REBAR_ARCH_TARGET}-ld ... +%% ${REBAR_TARGET_ARCH}-gcc, ${REBAR_TARGET_ARCH}-ld ... %% get_arch() -> - Arch = os:getenv("REBAR_ARCH_TARGET"), + Arch = os:getenv("REBAR_TARGET_ARCH"), Words = wordsize(Arch), otp_release() ++ "-" ++ get_system_arch(Arch) ++ "-" ++ Words. @@ -114,17 +114,18 @@ get_system_arch(Arch) -> Arch. wordsize() -> - wordsize(os:getenv("REBAR_ARCH_TARGET")). + wordsize(os:getenv("REBAR_TARGET_ARCH")). wordsize(Arch) when Arch =:= false; Arch =:= "" -> native_wordsize(); wordsize(Arch) -> case match_wordsize(Arch, [{"i686","32"}, {"i386","32"}, - {"arm","32"}, {"x86_64","64"}]) of + {"arm","32"}, {"aarch64", "64"}, + {"x86_64","64"}]) of false -> case cross_wordsize(Arch) of "" -> - env_wordsize(os:getenv("REBAR_ARCH_WORDSIZE")); + env_wordsize(os:getenv("REBAR_TARGET_ARCH_WORDSIZE")); WordSize -> WordSize end; {_, Wordsize} -> @@ -140,7 +141,7 @@ match_wordsize(Arch, [V={Match,_Bits}|Vs]) -> env_wordsize(Wordsize) when Wordsize =:= false; Wordsize =:= "" -> - io:format("REBAR_ARCH_WORDSIZE not set, assuming 32\n"), + io:format("REBAR_TARGET_ARCH_WORDSIZE not set, assuming 32\n"), "32"; env_wordsize(Wordsize) -> try list_to_integer(Wordsize) of @@ -148,11 +149,11 @@ env_wordsize(Wordsize) -> 32 -> "32"; 64 -> "64"; _ -> - io:format("REBAR_ARCH_WORDSIZE bad value: ~p\n", [Wordsize]), + io:format("REBAR_TARGET_ARCH_WORDSIZE bad value: ~p\n", [Wordsize]), "32" catch error:_ -> - io:format("REBAR_ARCH_WORDSIZE bad value: ~p\n", [Wordsize]), + io:format("REBAR_TARGET_ARCH_WORDSIZE bad value: ~p\n", [Wordsize]), "32" end. |