Configurations/15-android.conf: refine clang support.
Adjusting ARM default broke clang support, and x86[_64] needed
path adjustment.
if (which("clang") !~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
die "no NDK clang on \$PATH";
}
+ my $host=$1;
# harmonize with gcc default
- (my $tridefault = $triarch) =~ s|^arm-|armv5te-|;
- $cflags .= " -target $tridefault -gcc-toolchain "
- . "\$(ANDROID_NDK)/toolchains/$triarch-4.9/prebuilt/$1";
+ (my $tridefault = $triarch) =~ s/^arm-/armv5te-/;
+ (my $tritools = $triarch) =~ s/(?:x|i6)86(_64)?-.*/x86$1/;
+ $cflags .= " -target $tridefault "
+ . "-gcc-toolchain \$(ANDROID_NDK)/toolchains"
+ . "/$tritools-4.9/prebuilt/$host";
$user{CROSS_COMPILE} = undef;
} else {
$cflags .= " -mandroid";
