diff options
| author | Richard Levitte <levitte@openssl.org> | 2023-04-14 13:47:34 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-04-18 15:22:09 +0200 |
| commit | ba562570678ca13c1a6e03eb69e98c8d0f589754 (patch) | |
| tree | 8ae3018ec0e9bfaf424884ae790d4d270200eb6d | |
| parent | 44e816bd540c8687c1b4995febbde2626a655338 (diff) | |
| download | openssl-new-ba562570678ca13c1a6e03eb69e98c8d0f589754.tar.gz | |
Configurations/descrip.mms.tmpl: Fix a few typos
These typos caused failed propagation of the 'cflags' attribute from
Configurations/10-main.conf.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20737)
(cherry picked from commit 04e0abc8bb1c24534d16cc930b611ac1d03bc9bf)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index d4a1792ec4..337fc1e5e5 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -125,7 +125,7 @@ my @lib_cflags_no_inst = ( $target{no_inst_lib_cflags} // @lib_cflags ); my @lib_cflags_cont = ( $target{shared_cflag} || (), @{$config{lib_cflags}}, @{$config{shared_cflag}}, - $cnf_cflags, '$(CFLAGS)'); + @cnf_cflags, '$(CFLAGS)'); our $lib_cflags = join('', @lib_cflags, @lib_cflags_cont ); our $lib_cflags_no_inst = join('', @lib_cflags_no_inst, @lib_cflags_cont ); our $lib_ldflags = @@ -161,7 +161,7 @@ my @dso_cflags_no_inst = ( $target{no_inst_dso_cflags} // @dso_cflags ); my @dso_cflags_cont = ( $target{module_cflag} || (), @{$config{dso_cflags}}, @{$config{module_cflag}}, - $cnf_cflags, '$(CFLAGS)'); + @cnf_cflags, '$(CFLAGS)'); our $dso_cflags = join('', @dso_cflags, @dso_cflags_cont ); our $dso_cflags_no_inst = join('', @dso_cflags_no_inst, @dso_cflags_cont ); our $dso_ldflags = @@ -196,13 +196,9 @@ my @bin_cflags = ( $target{bin_cflags} // () ); my @bin_cflags_no_inst = ( $target{no_inst_bin_cflags} // @bin_cflags ); my @bin_cflags_cont = ( @{$config{bin_cflags}}, - $cnf_cflags, '$(CFLAGS)'); + @cnf_cflags, '$(CFLAGS)'); our $bin_cflags = join('', @bin_cflags, @bin_cflags_cont ); our $bin_cflags_no_inst = join('', @bin_cflags_no_inst, @bin_cflags_cont ); - our $bin_cflags = - join('', $target{bin_cflags} || (), - @{$config{bin_cflags}}, - @cnf_cflags, '$(CFLAGS)'); our $bin_ldflags = join('', $target{bin_lflags} || (), @{$config{bin_lflags}}, |