Skip to content

Commit 3b80925

Browse files
committed
[test] Update libgcc path for Android NDK r12
As noted in 8d4bc74, the Android NDK r12 release appends a ".x" to the libgcc directory; it is now: ``` android-ndk-r12/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x ``` Update the linker path used for the Android test suite to accomodate for this change.
1 parent 3d0252a commit 3b80925

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

test/lit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ elif run_os == 'linux-androideabi':
767767
config.android_ndk_gcc_version),
768768
"prebuilt", "linux-x86_64", "lib", "gcc",
769769
"arm-linux-androideabi",
770-
config.android_ndk_gcc_version))
770+
"{}.x".format(config.android_ndk_gcc_version)))
771771
config.target_build_swift = (
772772
'%s -target %s -sdk %s %s -Xlinker -pie %s %s %s %s'
773773
% (config.swiftc, config.variant_triple, config.variant_sdk,

0 commit comments

Comments
 (0)