Skip to content

Commit

Permalink
Fix Android tool name inconsistency.
Browse files Browse the repository at this point in the history
While the clang and clang++ binaries have prefixes matching `ABITRIPLE`,
all the other tools omit "v7a."

Fortunately NDK 22 did away with this complexity.
  • Loading branch information
player-03 committed May 24, 2022
1 parent 0f93029 commit bc891ed
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion toolchain/android-toolchain-clang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<set name="ARCH" value="-v7" />
<set name="PLATFORM_NUMBER" value="16" />
<set name="ABITRIPLE" value="armv7a-linux-androideabi" />
<set name="EXEPREFIX" value="arm-linux-androideabi" />
</section>

<section if="HXCPP_ARM64">
Expand All @@ -34,7 +35,7 @@

<section unless="NDKV22+">
<set name="HXCPP_AR" value="arm-linux-androideabi-ar" />
<set name="EXEPREFIX" value="${ABITRIPLE}" />
<set name="EXEPREFIX" value="${ABITRIPLE}" unless="EXEPREFIX" />
</section>
<section if="NDKV22+">
<set name="HXCPP_AR" value="llvm-ar" />
Expand Down

0 comments on commit bc891ed

Please sign in to comment.