提交 5283e19f 编写于 作者: B Bernd Edlinger

Fix the build_all_generated rule to include generated .map, .def and .opt files

Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5900)
上级 ceaa3894
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
grep { defined $unified_info{generate}->{$_} } grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} } map { @{$unified_info{sources}->{$_}} }
grep { /\.o$/ } keys %{$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 # This is a horrible hack, but is needed because recursive inclusion of files
# in different directories does not work well with HP C. # in different directories does not work well with HP C.
......
...@@ -111,7 +111,7 @@ GENERATED={- join(" ", ...@@ -111,7 +111,7 @@ GENERATED={- join(" ",
( grep { defined $unified_info{generate}->{$_} } ( grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} } map { @{$unified_info{sources}->{$_}} }
grep { /\.(?:o|res)$/ } keys %{$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_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}
INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -} INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}
......
...@@ -93,7 +93,7 @@ GENERATED={- join(" ", ...@@ -93,7 +93,7 @@ GENERATED={- join(" ",
grep { defined $unified_info{generate}->{$_} } grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} } map { @{$unified_info{sources}->{$_}} }
grep { /\.o$/ } keys %{$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_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}
INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -} INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册