diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-03-14 09:45:31 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-03-19 14:31:30 +0100 |
| commit | f41c8674c481ae32164430e0797979e29896cd77 (patch) | |
| tree | 06271dac17016165a7258276619cbc34e441eaa3 /Configurations/15-android.conf | |
| parent | 6d5e74f3fcd7135b829edd17758762de3fb2d594 (diff) | |
Configurations/15-android.conf: refine clang support.
Adjusting ARM default broke clang support, and x86[_64] needed
path adjustment.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5613)
Diffstat (limited to 'Configurations/15-android.conf')
| -rw-r--r-- | Configurations/15-android.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf index b524858077..e7c9fa0d1d 100644 --- a/Configurations/15-android.conf +++ b/Configurations/15-android.conf @@ -76,10 +76,13 @@ 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"; |