From 21d1994faf7f6e41ad3221caeab2385e3aaba892 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 15 Apr 2021 16:16:59 +0100 Subject: [PATCH] Don't worry about magic in the Makefile for 3.0 We remove a TODO(3.0) from the unix Makefile template. The current approach works. It can be improved later. Fixes #14403 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14887) --- Configurations/unix-Makefile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 64c5faff18a..c4755c54cd6 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1696,7 +1696,7 @@ EOF @{$args{objs}}; my @deps = compute_lib_depends(@{$args{deps}}); my $shared_def = join("", map { ' '.$target{shared_defflag}.$_ } @defs); - # TODO(3.0): next line needs to become "less magic" (see PR #11950) + # Next line needs to become "less magic" (see PR #11950) $shared_def .= ' '.$target{shared_fipsflag} if (m/providers\/fips/ && defined $target{shared_fipsflag}); my $objs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @objs)); my $deps = join(" \\\n" . ' ' x (length($dso) + 2), -- 2.47.2