diff options
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 | ||||
| -rwxr-xr-x | Configure | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index ac19141a95..36a7ffbf93 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -733,9 +733,6 @@ uninstall_engines: @set -e; for e in dummy $(INSTALL_ENGINES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ - if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \ - continue; \ - fi; \ $(ECHO) "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \ $(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \ done @@ -760,9 +757,6 @@ uninstall_modules: @set -e; for e in dummy $(INSTALL_MODULES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ - if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \ - continue; \ - fi; \ $(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$$fn"; \ $(RM) $(DESTDIR)$(MODULESDIR)/$$fn; \ done @@ -579,7 +579,7 @@ my @disable_cascades = ( # or modules. "pic" => [ "shared", "module" ], - "module" => [ "fips" ], + "module" => [ "fips", "dso" ], "engine" => [ grep /eng$/, @disablables ], "hw" => [ "padlockeng" ], @@ -1444,7 +1444,7 @@ unless($disabled{threads}) { } my $no_shared_warn=0; -if ($target{shared_target} eq "") +if (($target{shared_target} // '') eq "") { $no_shared_warn = 1 if (!$disabled{shared} || !$disabled{"dynamic-engine"}); |