The branch master has been updated
via 5283e19f11f06d26bc92c6351cbb61324ffb3dfc (commit)
from ceaa389445f9f6b99244bd45041580883b4e8502 (commit)
- Log -----------------------------------------------------------------
commit 5283e19f11f06d26bc92c6351cbb61324ffb3dfc
Author: Bernd Edlinger <[email protected]>
Date: Fri Apr 6 17:46:27 2018 +0200
Fix the build_all_generated rule to include generated .map, .def and .opt
files
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5900)
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 2 +-
Configurations/unix-Makefile.tmpl | 2 +-
Configurations/windows-makefile.tmpl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index f6061f1..029ba57 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -59,7 +59,7 @@
grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} }
grep { /\.o$/ } keys %{$unified_info{sources}} ),
- ( grep { /\.h$/ } keys %{$unified_info{generate}} ) );
+ ( grep { /\.(?:h|opt)$/ } keys %{$unified_info{generate}}
) );
# This is a horrible hack, but is needed because recursive inclusion of files
# in different directories does not work well with HP C.
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index caf2783..62fd5e7 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -111,7 +111,7 @@ GENERATED={- join(" ",
( grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} }
grep { /\.(?:o|res)$/ } keys %{$unified_info{sources}} ),
- ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}
+ ( grep { /\.(?:h|map|def)$/ } keys
%{$unified_info{generate}} )) -}
INSTALL_LIBS={- join(" ", map { lib($_) }
@{$unified_info{install}->{libraries}}) -}
INSTALL_SHLIBS={- join(" ", map { shlib($_) }
@{$unified_info{install}->{libraries}}) -}
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index e9179a4..5d767f7 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -93,7 +93,7 @@ GENERATED={- join(" ",
grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} }
grep { /\.o$/ } keys %{$unified_info{sources}} ),
- ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}
+ ( grep { /\.(?:h|def)$/ } keys %{$unified_info{generate}} ))
-}
INSTALL_LIBS={- join(" ", map { lib($_) }
@{$unified_info{install}->{libraries}}) -}
INSTALL_SHLIBS={- join(" ", map { shlib($_) }
@{$unified_info{install}->{libraries}}) -}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
