diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-23 19:07:14 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-24 15:54:01 +0100 |
| commit | 1b5ad51fc9b29d8893d5224f00bb3360f8aca465 (patch) | |
| tree | e185577aae6eed646e131b65756105f34c613248 /Configurations | |
| parent | 4bed94f0c11ef63587c6b2edb03c3c438e221604 (diff) | |
Configure: let INCLUDEs set on binaries "trickle down" to the objects
This ensures that only one set of includes is associated with each
object file, reagardless of where it's used.
For example, if apps/build.info has this:
SOURCE[openssl]=foo.c
INCLUDE[openssl]=.. ../include
and test/build.info has this:
SOURCE[footest]=../apps/foo.c
INCLUDE[footest]=../include
The inclusion directories used for apps/foo.o would differ depending
on which program's dependencies get generated first in the build file.
With this change, all those INCLUDEs get combined into one set of
inclusion directories tied to the object file.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5153)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/common.tmpl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index b9937bd434..180621e749 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -82,8 +82,7 @@ generator_incs => $unified_info{includes}->{$script}, generator_deps => $unified_info{depends}->{$script}, deps => $unified_info{depends}->{$src}, - incs => [ @{$unified_info{includes}->{$bin}}, - @{$unified_info{includes}->{$obj}} ], + incs => $unified_info{includes}->{$obj}, %opts); foreach (@{$unified_info{depends}->{$src}}) { dogenerate($_, $obj, $bin, %opts); @@ -104,8 +103,7 @@ product => $bin, srcs => $unified_info{sources}->{$obj}, deps => $unified_info{depends}->{$obj}, - incs => [ @{$unified_info{includes}->{$bin}}, - @{$unified_info{includes}->{$obj}} ], + incs => $unified_info{includes}->{$obj}, %opts); foreach ((@{$unified_info{sources}->{$obj}}, @{$unified_info{depends}->{$obj}})) { |