summaryrefslogtreecommitdiffstats
path: root/apps/progs.pl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-05-18 18:22:57 +0200
committerRichard Levitte <levitte@openssl.org>2021-05-19 19:04:06 +0200
commitda750b15c0e69f809243d56eceb37d56a8fc9cfd (patch)
treeeacfec3ef27dcd988c4c82a399bbb980901fe2de /apps/progs.pl
parentdd05c7938d70b620204f2808812f3bf7c535db48 (diff)
Make apps/progs.pl not look at apps/progs.c
apps/progs.pl will have apps/progs.c as output, and on some systems, the output file of a program is locked against reading. Unfortunately, apps/progs.c is also part of the sources that make up apps/openssl, so it's necessary to mark that file in a way that makes progs.pl skip over it. Fortunately, this is easily done with a special attribute in apps/build.info and a simple adaptation of apps/progs.pl. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15332)
Diffstat (limited to 'apps/progs.pl')
-rw-r--r--apps/progs.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/progs.pl b/apps/progs.pl
index ff39f85325..8a5759a961 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -28,7 +28,8 @@ my $YEAR = [localtime()]->[5] + 1900;
# the lookups in %unified_info
my @openssl_source =
map { @{$unified_info{sources}->{$_}} }
- grep { /\.o$/ }
+ grep { /\.o$/
+ && !$unified_info{attributes}->{sources}->{$apps_openssl}->{$_}->{nocheck} }
@{$unified_info{sources}->{$apps_openssl}};
foreach my $filename (@openssl_source) {