root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Adapt C compiler detection for VSI C on x86_64 

VSI C on OpenVMS for x86_64 has a bit more information than on other
hardware.  This is no doubt because it's based on LLVM which leaves an
opening for cross compilation.

VSI C on Itanium:

    $ CC/VERSION
    VSI C V7.4-001 on OpenVMS IA64 V8.4-2L3

VSI C on x86_64:

    $ CC/VERSION
    VSI C x86-64 X7.4-843 (GEM 50XB9) on OpenVMS x86_64 V9.2-1

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22792)
This commit is contained in:
Richard Levitte 2023-11-21 14:36:37 +01:00 committed by Hugo Landau
parent e580f06dec
commit df5e72d220
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/perl/OpenSSL/config.pm
View File

@ -359,8 +359,15 @@ sub determine_compiler_settings {
# However, other letters have been seen as well (for example X), # However, other letters have been seen as well (for example X),
# and it's documented that HP (now VSI) reserve the letter W, X, # and it's documented that HP (now VSI) reserve the letter W, X,
# Y and Z for their own uses. # Y and Z for their own uses.
my ($vendor, $version) = my ($vendor, $arch, $version, $extra) =
( $v =~ m/^([A-Z]+) C [VWXYZ]([0-9\.-]+)(:? +\(.*?\))? on / ); ( $v =~ m/^
([A-Z]+) # Usually VSI
\s+ C
(?:\s+(.*?))? # Possible build arch
\s+ [VWXYZ]([0-9\.-]+) # Version
(?:\s+\((.*?)\))? # Possible extra data
\s+ on
/x );
my ($major, $minor, $patch) = my ($major, $minor, $patch) =
( $version =~ m/^([0-9]+)\.([0-9]+)-0*?(0|[1-9][0-9]*)$/ ); ( $version =~ m/^([0-9]+)\.([0-9]+)-0*?(0|[1-9][0-9]*)$/ );
$CC = 'CC'; $CC = 'CC';