From 722c9762f2e021a9b43774fca282c9a4146d38e6 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 13 Feb 2018 20:32:42 +0100 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/5357) --- engines/build.info | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engines/build.info') diff --git a/engines/build.info b/engines/build.info index ad5cc162a3..df173ea69d 100644 --- a/engines/build.info +++ b/engines/build.info @@ -38,7 +38,6 @@ IF[{- !$disabled{"engine"} -}] ENDIF GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) ENDIF -- cgit v1.2.3