diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-02 09:34:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-02 14:45:02 +0100 |
| commit | b756967d28f2ee726d947ca7a6e1075df616b300 (patch) | |
| tree | 5badb5e0012ebc534e8b2c900dd7ee3ef5af6429 /Makefile.in | |
| parent | dc22d6b37e8058a4334e6f98932c2623cd3d8d0d (diff) | |
Make uplink auxiliary source separate from cpuid source
There are cases, for example when configuring no-asm, that the added
uplink source files got in the way of the cpuid ones. The best way to
solve this is to separate the two.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 611130974a..bddbfdbce8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,6 +125,7 @@ PROCESSOR= {- $config{processor} -} # CPUID module collects small commonly used assembler snippets APPS_OBJ={- $target{apps_obj} -} CPUID_OBJ= {- $target{cpuid_obj} -} +UPLINK_OBJ= {- $target{uplink_obj} -} BN_ASM= {- $target{bn_obj} -} EC_ASM= {- $target{ec_obj} -} DES_ENC= {- $target{des_obj} -} @@ -268,7 +269,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ SHLIB_TARGET='$(SHLIB_TARGET)' \ LDFLAG='$(LDFLAG)' \ PLIB_LDFLAG='$(PLIB_LDFLAG)' EX_LIBS='$(EX_LIBS)' \ - APPS_OBJ='$(APPS_OBJ)' \ + APPS_OBJ='$(APPS_OBJ)' UPLINK_OBJ='$(UPLINK_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)' \ |