diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-08-26 14:00:56 -0400 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2020-08-27 20:27:26 -0700 |
| commit | cd84d8832d274357a5ba5433640d7ef76691b1ac (patch) | |
| tree | e8d3b1c729ca6e6e7e637d1c5f4e0ca9200cf2c0 /util | |
| parent | 4516bf7422223a47f98931c1315985bd9dc303af (diff) | |
Ignore vendor name in Clang version number.
For example, FreeBSD prepends "FreeBSD" to version string, e.g.,
FreeBSD clang version 11.0.0 (git@github.com:llvm/llvm-project.git llvmorg-11.0.0-rc2-0-g414f32a9e86)
Target: x86_64-unknown-freebsd13.0
Thread model: posix
InstalledDir: /usr/bin
This prevented us from properly detecting AVX support, etc.
CLA: trivial
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/12725)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/perl/OpenSSL/config.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index e72eadc8a9..4409c98df6 100755 --- a/util/perl/OpenSSL/config.pm +++ b/util/perl/OpenSSL/config.pm @@ -50,7 +50,7 @@ my @cc_version = ( clang => sub { my $v = `$CROSS_COMPILE$CC -v 2>&1`; - $v =~ m/(?:(?:^clang|LLVM) version|.*based on LLVM)\s+([0-9]+\.[0-9]+)/; + $v =~ m/(?:(?:clang|LLVM) version|.*based on LLVM)\s+([0-9]+\.[0-9]+)/; return $1; }, gnu => sub { |