Merge pull request #770 from Faless/build/3.4_fix_android

3.4
Rémi Verschelde 2022-06-17 15:23:51 +02:00 committed by GitHub
commit 36fc84dae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

View File

@ -369,11 +369,11 @@ elif env["platform"] == "android":
# Setup tools # Setup tools
env["CC"] = toolchain + "/bin/clang" env["CC"] = toolchain + "/bin/clang"
env["CXX"] = 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/" + arch_info["tool_path"] + "-as" env["AS"] = toolchain + "/bin/llvm-as"
env["LD"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ld" env["LD"] = toolchain + "/bin/llvm-ld"
env["STRIP"] = toolchain + "/bin/" + arch_info["tool_path"] + "-strip" env["STRIP"] = toolchain + "/bin/llvm-strip"
env["RANLIB"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ranlib" env["RANLIB"] = toolchain + "/bin/llvm-ranlib"
env.Append( env.Append(
CCFLAGS=["--target=" + arch_info["target"] + env["android_api_level"], "-march=" + arch_info["march"], "-fPIC"] CCFLAGS=["--target=" + arch_info["target"] + env["android_api_level"], "-march=" + arch_info["march"], "-fPIC"]