diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2022-06-15 00:00:36 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2022-06-15 00:00:36 +0200 |
| commit | b8ae658981c5f9b59889ba805290953a0b9911ed (patch) | |
| tree | 22dae250665d5f89b475e676d3c347617d7c1af1 /SConstruct | |
| parent | 8dbaf5a7ff0b75222948d9e53633f584499f12bf (diff) | |
| download | redot-cpp-b8ae658981c5f9b59889ba805290953a0b9911ed.tar.gz | |
[SCons] Fix Android builds with modern NDKs.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -419,28 +419,24 @@ elif env["platform"] == "android": "arm32": { "march": "armv7-a", "target": "armv7a-linux-androideabi", - "tool_path": "arm-linux-androideabi", "compiler_path": "armv7a-linux-androideabi", "ccflags": ["-mfpu=neon"], }, "arm64": { "march": "armv8-a", "target": "aarch64-linux-android", - "tool_path": "aarch64-linux-android", "compiler_path": "aarch64-linux-android", "ccflags": [], }, "x86_32": { "march": "i686", "target": "i686-linux-android", - "tool_path": "i686-linux-android", "compiler_path": "i686-linux-android", "ccflags": ["-mstackrealign"], }, "x86_64": { "march": "x86-64", "target": "x86_64-linux-android", - "tool_path": "x86_64-linux-android", "compiler_path": "x86_64-linux-android", "ccflags": [], }, @@ -450,7 +446,11 @@ elif env["platform"] == "android": # Setup tools env["CC"] = toolchain + "/bin/clang" env["CXX"] = toolchain + "/bin/clang++" - env["AR"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ar" + env["AR"] = toolchain + "/bin/llvm-ar" + env["AS"] = toolchain + "/bin/llvm-as" + env["LD"] = toolchain + "/bin/llvm-ld" + env["STRIP"] = toolchain + "/bin/llvm-strip" + env["RANLIB"] = toolchain + "/bin/llvm-ranlib" env["SHLIBSUFFIX"] = ".so" env.Append( |