diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-11-02 13:08:38 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-11-05 08:13:05 +0100 |
| commit | 7b34f0fa5d060409be1fb5165ef29e5a159b1e33 (patch) | |
| tree | 88c3ee121f1bd02cac650f72c4d3677de188fc05 /Configurations | |
| parent | 0a37ff4dcaf7da498355dfe9a1672905ac5496a5 (diff) | |
| download | openssl-7b34f0fa5d060409be1fb5165ef29e5a159b1e33.zip openssl-7b34f0fa5d060409be1fb5165ef29e5a159b1e33.tar.gz openssl-7b34f0fa5d060409be1fb5165ef29e5a159b1e33.tar.bz2 | |
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: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7553)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/common.tmpl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index b7d2a07..bf440d9 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -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}})) { |