The branch master has been updated via 2f9ded524c2c95ab4efcc12b14e098eb4613d2f5 (commit) from cf1a231d44db81f8565ecae5498a4f1f6f0168c9 (commit)
- Log ----------------------------------------------------------------- commit 2f9ded524c2c95ab4efcc12b14e098eb4613d2f5 Author: Richard Levitte <levi...@openssl.org> Date: Wed Sep 8 20:16:37 2021 +0200 VMS: Fix descrip.mms template away the use of $(DEFINES), which does get populated with defines given through configuration. This makes it impossible to configure with extra defines on VMS. Uncommenting and moving $(DEFINES) to a more proper spot gives the users back that ability. Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16561) (cherry picked from commit 1dc15a3330434ef1f79921a2d97c585048dcf05e) ----------------------------------------------------------------------- Summary of changes: Configurations/descrip.mms.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 42dea4752a..9812df2aef 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -110,9 +110,9 @@ @cnf_defines, 'OPENSSLDIR="""$(OPENSSLDIR_C)"""', 'ENGINESDIR="""$(ENGINESDIR_C)"""', - 'MODULESDIR="""$(MODULESDIR_C)"""', - #'$(DEFINES)' + 'MODULESDIR="""$(MODULESDIR_C)"""' ) + . '$(DEFINES)' . "'extradefines'"; our $lib_asflags = join(' ', $target{lib_asflags} || (), @{$config{lib_asflags}}, @@ -144,8 +144,8 @@ join(',', @{$target{dso_defines}}, @{$target{module_defines}}, @{$config{dso_defines}}, @{$config{module_defines}}, @cnf_defines, - #'$(DEFINES)' ) + . '$(DEFINES)' . "'extradefines'"; our $dso_asflags = join(' ', $target{dso_asflags} || (), $target{module_asflags} || (), @@ -180,8 +180,8 @@ join(',', @{$target{bin_defines}}, @{$config{bin_defines}}, @cnf_defines, - #'$(DEFINES)' ) + . '$(DEFINES)' . "'extradefines'"; our $bin_asflags = join(' ', $target{bin_asflags} || (),