Skip to content

Commit

Permalink
Don't worry about magic in the Makefile for 3.0
Browse files Browse the repository at this point in the history
We remove a TODO(3.0) from the unix Makefile template. The current
approach works. It can be improved later.

Fixes openssl#14403

Reviewed-by: Paul Dale <[email protected]>
(Merged from openssl#14887)
  • Loading branch information
mattcaswell committed Apr 19, 2021
1 parent 57e7401 commit 21d1994
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Configurations/unix-Makefile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit 21d1994

Please sign in to comment.