diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-13 17:02:28 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-09-14 11:00:38 +0200 |
| commit | c40af30ec5b8ef30be870ad734fc8bf9caeeafc2 (patch) | |
| tree | ede967f1f299379552668f2aa00d666973fa64cf /Configurations | |
| parent | 34f5c8b1ff7b9a9a15f6a71c22fe83c2762b99d9 (diff) | |
VMS build: fix a misspelled 'bin_cflags' and a wrongly coded 'NO_INST_'
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7208)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 95fa521b9e..fa629ee552 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -298,8 +298,8 @@ BIN_CPPFLAGS={- join('', "'qual_includes'", $target{bin_cppflags} || (), @{$config{bin_cppflag}}, '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} -BIN_CFLAGS={- join('', $target{bin_cflag} || (), - @{$config{bin_cflag}}, +BIN_CFLAGS={- join('', $target{bin_cflags} || (), + @{$config{bin_cflags}}, '$(CNF_CFLAGS)', '$(CFLAGS)') -} BIN_LDFLAGS={- join('', $target{bin_lflags} || (), @{$config{bin_lflags}} || (), @@ -312,12 +312,14 @@ NO_INST_LIB_CFLAGS={- join('', $target{no_inst_lib_cflags} @{$config{lib_cflags}}, @{$config{shared_cflag}}, '$(CNF_CFLAGS)', '$(CFLAGS)') -} -NO_INST_DSO_CFLAGS={- join('', $target{no_inst_lib_cflags} - // $target{lib_cflags} +NO_INST_DSO_CFLAGS={- join('', $target{no_inst_dso_cflags} + // $target{dso_cflags} + // (), + $target{no_inst_module_cflags} + // $target{module_cflags} // (), - $target{dso_cflags} || (), - @{$config{lib_cflags}}, @{$config{dso_cflags}}, + @{$config{module_cflags}}, '$(CNF_CFLAGS)', '$(CFLAGS)') -} NO_INST_BIN_CFLAGS={- join('', $target{no_inst_bin_cflags} // $target{bin_cflags} |