diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-18 18:43:56 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-19 11:06:54 +0100 |
| commit | 3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee (patch) | |
| tree | 59e5462b3f76ce4de66c9b5dc8243f5d8f632670 /Makefile.in | |
| parent | 5be5e56c09015633d94fb1ee1290081a78074546 (diff) | |
Rethink the uplink / applink story
Adding uplink and applink to some builds was done by "magic", the
configuration for "mingw" only had a macro definition, the Configure
would react to its presence by adding the uplink source files to
cpuid_asm_src, and crypto/build.info inherited dance to get it
compiled, and Makefile.shared made sure applink.o would be
appropriately linked in. That was a lot under the hood.
To replace this, we create a few template configurations in
Configurations/00-base-templates.conf, inherit one of them in the
"mingw" configuration, the rest is just about refering to the
$target{apps_aux_src} / $target{apps_obj} in the right places.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 79a1ea95eb..9912d8868a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -120,6 +120,7 @@ ASFLAG=$(CFLAG) PROCESSOR= {- $config{processor} -} # CPUID module collects small commonly used assembler snippets +APPS_OBJ={- $target{apps_obj} -} CPUID_OBJ= {- $target{cpuid_obj} -} BN_ASM= {- $target{bn_obj} -} EC_ASM= {- $target{ec_obj} -} @@ -260,6 +261,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ LDFLAG='$(LDFLAG)' \ PLIB_LDFLAG='$(PLIB_LDFLAG)' EX_LIBS='$(EX_LIBS)' \ + APPS_OBJ='$(APPS_OBJ)' \ CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ |