summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-06-16 12:37:21 +0200
committerRichard Levitte <levitte@openssl.org>2019-06-17 16:08:52 +0200
commitb19fe714e9d4c50dcb33259346f06d3924b337b7 (patch)
tree36810ed3f2240d61cd2ebff6d3367da9290b8772 /Configure
parent0ee7b9fe7f9afadcf566d740e01043faeaa9476e (diff)
Configure: add mechanism to specify uplink target architecture
As preparation for moving uplink file specs to build.info files, we must make sure there is still some base information to help select the correct files. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure4
1 files changed, 4 insertions, 0 deletions
diff --git a/Configure b/Configure
index c238907bee..2aed8fac61 100755
--- a/Configure
+++ b/Configure
@@ -1135,6 +1135,10 @@ foreach my $feature (@{$target{enable}}) {
delete $disabled{$feature};
}
}
+
+# If uplink_arch isn't defined, disable uplink
+$disabled{uplink} = 'no uplink_arch' unless (defined $target{uplink_arch});
+
disable(); # Run a cascade now
$target{CXXFLAGS}//=$target{CFLAGS} if $target{CXX};