Directory structure mismatch for new Android NDK - libgcc.a: No such file or directory

[mastef]

When compiling with the latest android NDK I'm getting a

arm-linux-androideabi-g++: error:
    /SDKs/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a: No such file or directory

Error: error running
    arm-linux-androideabi-g++
     -olibApplicationMain-debug-v7.so
     -frtti
     -nostdlib
     -Wl,-shared,-Bsymbolic
     -Wl,--no-undefined
     -Wl,-z,noexecstack
     --sysroot=/SDKs/android-ndk/platforms/android-9/arch-arm
     -L/SDKs/android-ndk/platforms/android-9/arch-arm/usr/lib @obj/android-debug-v7/all_objs /SDKs/android-ndk/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_static.a /SDKs/android-ndk/platforms/android-9/arch-arm/usr/lib/crtbegin_so.o /SDKs/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a /SDKs/android-ndk/platforms/android-9/arch-arm/usr/lib/libc.so /SDKs/android-ndk/platforms/android-9/arch-arm/usr/lib/libm.so
     -llog
     -ldl

This is because the folder structure has changed, android-toolchain.xml is looking in
lib name="${prebuiltBase}/lib/gcc/${EXEPREFIX}/${TOOLCHAIN_VERSION}/libgcc.a"/>
which results in :
/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
but the file is in :
/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a:

https://github.com/HaxeFoundation/hxcpp/blob/master/toolchain/android-toolchain.xml#L162

So although the TOOLCHAIN_VERSION is correctly set to 4.9 ( and works for all other folders ), the folder structure in this case should resolve to 4.9.x. I guess adding a new variable like TOOLCHAIN_SUBVERSION or detecting if the folder exists could resolve this

[hughsando]

What a pain.
I wonder if I could get some kind of sysroot to work. I try before, but could not. The situation could be better now.

[mastef]

There must have been a similar issue with the 4.6 version as it had 4.6.x-google instead of 4.6 in the same spot.

[Misiur]

25247b4 - didn't this resolve it? (only for the problem in first post, not the 4.6.x-google)

[mastef]

Oh yeah that commit happened around the time when I posted the ticket, lgtm

[Misiur]

You were first. I think @jgranick saw your issue and fixed it right away, but didn't mention it in commit message/posted here.

Unrelated question: now we've got to wait for binary version bump to get this patch via haxelib?

[hughsando]

Is this one working now?