diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-13 20:32:42 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-14 17:13:53 +0100 |
| commit | 722c9762f2e021a9b43774fca282c9a4146d38e6 (patch) | |
| tree | baa43c8cea7110fdeaea39a9697df62a2ea25628 /crypto/sha | |
| parent | d2i_X509.pod: clarify usage of the 'pp' function parameter (diff) | |
| download | openssl-722c9762f2e021a9b43774fca282c9a4146d38e6.tar.xz openssl-722c9762f2e021a9b43774fca282c9a4146d38e6.zip | |
Harmonize the make variables across all known platforms families
The make variables LIB_CFLAGS, DSO_CFLAGS and so on were used in
addition to CFLAGS and so on. This works without problem on Unix and
Windows, where options with different purposes (such as -D and -I) can
appear anywhere on the command line and get accumulated as they come.
This is not necessarely so on VMS. For example, macros must all be
collected and given through one /DEFINE, and the same goes for
inclusion directories (/INCLUDE).
So, to harmonize all platforms, we repurpose make variables starting
with LIB_, DSO_ and BIN_ to be all encompassing variables that
collects the corresponding values from CFLAGS, CPPFLAGS, DEFINES,
INCLUDES and so on together with possible config target values
specific for libraries DSOs and programs, and use them instead of the
general ones everywhere.
This will, for example, allow VMS to use the exact same generators for
generated files that go through cpp as all other platforms, something
that has been impossible to do safely before now.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5357)
Diffstat (limited to 'crypto/sha')
| -rw-r--r-- | crypto/sha/build.info | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/crypto/sha/build.info b/crypto/sha/build.info index 4044b3f3ce..9dffec3f3e 100644 --- a/crypto/sha/build.info +++ b/crypto/sha/build.info @@ -4,24 +4,18 @@ SOURCE[../../libcrypto]=\ keccak1600.c GENERATE[sha1-586.s]=asm/sha1-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[sha1-586.s]=../perlasm/x86asm.pl GENERATE[sha256-586.s]=asm/sha256-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[sha256-586.s]=../perlasm/x86asm.pl GENERATE[sha512-586.s]=asm/sha512-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[sha512-586.s]=../perlasm/x86asm.pl -GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) +GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) +GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) +GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) GENERATE[sha1-alpha.S]=asm/sha1-alpha.pl $(PERLASM_SCHEME) |