Commit 7b34f0fa authored by Richard Levitte's avatar Richard Levitte
Browse files

Build: Make it possible to have defines assigned to end products as well 



This simple fix allows the following construct:

    PROGRAMS=foo
    SOURCE[foo]=foo.c bar.c
    DEFINE[foo]=FOO=1 BAR=0

These will trickle down to the build of object files, so building
foo.o and bar.o will be done with these options: -DFOO=1 -DBAR=0
(exact syntax depending on platform, of course)

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7553)
parent 0a37ff4d

Configurations/common.tmpl

+4 −2
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ 
                             deps => $unified_info{depends}->{$src},

                             incs => [ @{$unified_info{includes}->{$obj}},

                                       @{$unified_info{includes}->{$bin}} ],

                             defs => $unified_info{defines}->{$obj},

                             defs => [ @{$unified_info{defines}->{$obj}},

                                       @{$unified_info{defines}->{$bin}} ],

                             %opts);

         foreach (@{$unified_info{depends}->{$src}}) {

             dogenerate($_, $obj, $bin, %opts);
@@ -108,7 +109,8 @@ 
                         deps => $unified_info{depends}->{$obj},

                         incs => [ @{$unified_info{includes}->{$obj}},

                                   @{$unified_info{includes}->{$bin}} ],

                         defs => $unified_info{defines}->{$obj},

                         defs => [ @{$unified_info{defines}->{$obj}},

                                   @{$unified_info{defines}->{$bin}} ],

                         %opts);

         foreach ((@{$unified_info{sources}->{$obj}},

                   @{$unified_info{depends}->{$obj}})) {