diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 12:56:21 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | 989b2ad786ee43438bbb8b33f857ba0ce6e10082 (patch) | |
| tree | c151998c5fa3114d713ec4b6e649502f9cfb3dcc /crypto/build.info | |
| parent | b19fe714e9d4c50dcb33259346f06d3924b337b7 (diff) | |
| download | openssl-989b2ad786ee43438bbb8b33f857ba0ce6e10082.zip openssl-989b2ad786ee43438bbb8b33f857ba0ce6e10082.tar.gz openssl-989b2ad786ee43438bbb8b33f857ba0ce6e10082.tar.bz2 | |
Move uplink file information to build.info files
This file information was hidden in config target files, when they
should really be part of build.info like any other file we build
from. With build.info variables, the task became much easier.
We take the opportunity to move apps_init_src and apps_aux_src to
apps/build.info as well, and to clean up apps/build.info.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'crypto/build.info')
| -rw-r--r-- | crypto/build.info | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/crypto/build.info b/crypto/build.info index 849d468..fb0f3f0 100644 --- a/crypto/build.info +++ b/crypto/build.info @@ -8,6 +8,21 @@ SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 conf \ err comp ocsp cms ts srp cmac ct async kmac ess crmf cmp LIBS=../libcrypto + +$UPLINKSRC= +$UPLINKDEF= +IF[{- !$disabled{uplink} -}] + $UPLINKSRC_common=../ms/uplink.c + $UPLINKSRC_x86=$UPLINKSRC_common uplink-x86.s + $UPLINKSRC_x86_64=$UPLINKSRC_common uplink-x86_64.s + $UPLINKSRC_ia64=$UPLINKSRC_common uplink-ia64.s + + IF[$UPLINKSRC_{- $target{uplink_arch} -}] + $UPLINKSRC=$UPLINKSRC_{- $target{uplink_arch} -} + $UPLINKDEF=OPENSSL_USE_APPLINK + ENDIF +ENDIF + # The Core $CORE_COMMON=provider_core.c provider_predefined.c core_fetch.c core_namemap.c @@ -23,7 +38,8 @@ $UTIL_COMMON=\ SOURCE[../libcrypto]=$UTIL_COMMON \ mem_dbg.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \ o_fopen.c getenv.c o_init.c o_fips.c init.c trace.c provider.c \ - {- $target{uplink_aux_src} -} + $UPLINKSRC +DEFINE[../libcrypto]=$UPLINKDEF SOURCE[../providers/fips]=$UTIL_COMMON |