summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-04-15 16:16:59 +0100
committerMatt Caswell <matt@openssl.org>2021-04-19 10:41:51 +0100
commit21d1994faf7f6e41ad3221caeab2385e3aaba892 (patch)
tree71f2ca561d4334167fa92f30e2bdce3cec260812 /Configurations
parent57e7401fc5c6af8e9266a721be669a3b70fbfb3f (diff)
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 <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14887)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 64c5faff18..c4755c54cd 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),