Commit 2fce15b5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Ensure configured module specific and application specific defines are used 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8220)
parent 88780b1c

Configurations/unix-Makefile.tmpl

+6 −2
Original line number Diff line number Diff line
@@ -231,8 +231,8 @@ LIB_CPPFLAGS={- our $lib_cppflags = 
                join(' ', $target{lib_cppflags} || (),

                          $target{shared_cppflag} || (),

                          (map { '-D'.$_ }

                               @{$config{lib_defines}},

                               @{$config{shared_defines}}),

                               @{$config{lib_defines} || ()},

                               @{$config{shared_defines} || ()}),

                          @{$config{lib_cppflags}},

                          @{$config{shared_cppflag}});

                join(' ', $lib_cppflags,
@@ -256,6 +256,9 @@ LIB_LDFLAGS={- join(' ', $target{shared_ldflag} || (), 
LIB_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)

DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (),

                          $target{module_cppflags} || (),

                          (map { '-D'.$_ }

                               @{$config{dso_defines} || ()},

                               @{$config{module_defines} || ()}),

                          @{$config{dso_cppflags}},

                          @{$config{module_cppflags}},

                          '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
@@ -276,6 +279,7 @@ DSO_LDFLAGS={- join(' ', $target{dso_ldflags} || (), 
                         '$(CNF_LDFLAGS)', '$(LDFLAGS)') -}

DSO_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)

BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (),

                          (map { '-D'.$_ } @{$config{bin_defines} || ()}),

                          @{$config{bin_cppflags}},

                          '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}

BIN_CFLAGS={- join(' ', $target{bin_cflags} || (),