From e58f040c618c09f1899b86d1ca0af6bc7342bd1f Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 20 May 2019 23:59:05 +0800 Subject: remove -mthumb for android/x86_64 --- xmake/platforms/android/load.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'xmake/platforms/android/load.lua') diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index 94212458c..475315b72 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -26,14 +26,13 @@ function main(platform) -- init flags local arch = config.get("arch") - if arch:startswith("arm64") then - platform:add("ldflags", "-llog") - platform:add("shflags", "-llog") - else + platform:add("ldflags", "-llog") + platform:add("shflags", "-llog") + if arch and (arch == "armv5te" or arch == "armv7-a") then platform:add("cxflags", "-mthumb") platform:add("asflags", "-mthumb") - platform:add("ldflags", "-llog", "-mthumb") - platform:add("shflags", "-llog", "-mthumb") + platform:add("ldflags", "-mthumb") + platform:add("shflags", "-mthumb") end -- use llvm directory? e.g. android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin -- cgit v1.3.1