From bd2ea1cbde76afb4d5d9f39329982412783816d5 Mon Sep 17 00:00:00 2001 From: Zachary Carter Date: Sun, 19 Mar 2017 14:17:35 -0400 Subject: [PATCH] Set AR to NDK ARM. Fixes - https://github.com/bkaradzic/bgfx/issues/1022 (#144) * Since system AR seems to be failing... * Forgot end in toolchain.lua. * Leveraging ANDROID_NDK_ARM * Updating warning message when ANDROID_NDK_ARM isn't set. --- scripts/toolchain.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index a7afbf1..7781375 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -205,11 +205,13 @@ function toolchain(_buildDir, _libDir) if not os.getenv("ANDROID_NDK_ARM") or not os.getenv("ANDROID_NDK_CLANG") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_CLANG and ANDROID_NDK_ROOT envrionment variables.") + print("Set ANDROID_NDK_CLANG, ANDROID_NDK_ARM, and ANDROID_NDK_ROOT envrionment variables.") end premake.gcc.cc = "$(ANDROID_NDK_CLANG)/bin/clang" premake.gcc.cxx = "$(ANDROID_NDK_CLANG)/bin/clang++" + premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar" + premake.gcc.llvm = true location (path.join(_buildDir, "projects", _ACTION .. "-android-arm"))