diff options
| author | ruki <[email protected]> | 2018-11-15 00:49:25 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-11-14 22:56:32 +0800 |
| commit | b0cabeb7b3e21380073df6521cc9027b5ac3f1ca (patch) | |
| tree | 0f939b5ff941ea68af717804035328d60000315c /xmake/platforms/android/check.lua | |
| parent | 1feb7be8eca85f724b52fa875951179c52f9d018 (diff) | |
improve to build for android ndk
Diffstat (limited to 'xmake/platforms/android/check.lua')
| -rw-r--r-- | xmake/platforms/android/check.lua | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/xmake/platforms/android/check.lua b/xmake/platforms/android/check.lua index 7c1fa50b4..d2eafb583 100644 --- a/xmake/platforms/android/check.lua +++ b/xmake/platforms/android/check.lua @@ -33,6 +33,7 @@ function _check_ndk(config) config.set("ndk", ndk.sdkdir, {force = true, readonly = true}) -- maybe to global config.set("bin", ndk.bindir, {force = true, readonly = true}) config.set("cross", ndk.cross, {force = true, readonly = true}) + config.set("gcc_toolchain", ndk.gcc_toolchain, {force = true, readonly = true}) else -- failed cprint("${bright red}please run:") @@ -69,15 +70,13 @@ function _toolchains(config) checker.toolchain_insert(toolchains, "ex", cross, "ar", "the static library extractor") checker.toolchain_insert(toolchains, "sh", cross, "g++", "the shared library linker") checker.toolchain_insert(toolchains, "sh", cross, "gcc", "the shared library linker") - if is_host("windows") then - checker.toolchain_insert(toolchains, "cc", cross, "gcc.cmd", "the c compiler") - checker.toolchain_insert(toolchains, "cxx", cross, "g++.cmd", "the c++ compiler") - checker.toolchain_insert(toolchains, "as", cross, "gcc.cmd", "the assember") - checker.toolchain_insert(toolchains, "ld", cross, "g++.cmd", "the linker") - checker.toolchain_insert(toolchains, "ld", cross, "gcc.cmd", "the linker") - checker.toolchain_insert(toolchains, "sh", cross, "g++.cmd", "the shared library linker") - checker.toolchain_insert(toolchains, "sh", cross, "gcc.cmd", "the shared library linker") - end + checker.toolchain_insert(toolchains, "cc", "", "clang", "the c compiler") + checker.toolchain_insert(toolchains, "cxx", "", "clang++", "the c++ compiler") + checker.toolchain_insert(toolchains, "as", "", "clang", "the assember") + checker.toolchain_insert(toolchains, "ld", "", "clang++", "the linker") + checker.toolchain_insert(toolchains, "ld", "", "clang", "the linker") + checker.toolchain_insert(toolchains, "sh", "", "clang++", "the shared library linker") + checker.toolchain_insert(toolchains, "sh", "", "clang", "the shared library linker") -- insert rust tools to toolchains checker.toolchain_insert(toolchains, "rc", "", "rustc", "the rust compiler") |