提交 592b6fb4 编写于 作者: R Richard Levitte

Small MSVC build fixes.

- "/Ox /O2 /Ob2" get's reduced to "/O2", the reason being:

    /Ox = /Ob2 /Og /Oi /Ot /Oy /Gs
    /O2 = /Ob2 /Og /Oi /Ot /Oy /Gs /GF /Gy

- apps/openssl.cnf gets installed.

- always delete files quietly, as they might not be there.
Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1075)
上级 4e0e4d29
...@@ -1267,7 +1267,7 @@ sub vms_info { ...@@ -1267,7 +1267,7 @@ sub vms_info {
release => release =>
sub { sub {
($disabled{shared} ? "" : "/MD") ($disabled{shared} ? "" : "/MD")
." /Ox /O2 /Ob2"; ." /O2";
})), })),
lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }), lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }),
# Following might/should appears controversial, i.e. defining # Following might/should appears controversial, i.e. defining
......
...@@ -168,7 +168,7 @@ uninstall: uninstall_docs uninstall_sw ...@@ -168,7 +168,7 @@ uninstall: uninstall_docs uninstall_sw
libclean: libclean:
$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS) $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
-del /Q /F $(LIBS) -del /Q /F $(LIBS)
-del ossl_static.pdb -del /Q ossl_static.pdb
clean: libclean clean: libclean
-del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS) -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
...@@ -195,6 +195,8 @@ uninstall_docs: ...@@ -195,6 +195,8 @@ uninstall_docs:
install_ssldirs: install_ssldirs:
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs" @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private" @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"
@$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\apps\openssl.cnf \
"$(DESTDIR)$(OPENSSLDIR)"
install_dev: install_dev:
@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
...@@ -390,8 +392,8 @@ $target: $deps $ordinalsfile $mkdef_pl ...@@ -390,8 +392,8 @@ $target: $deps $ordinalsfile $mkdef_pl
/implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1) /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
$objs $shlib.res$linklibs \$(EX_LIBS) $objs $shlib.res$linklibs \$(EX_LIBS)
<< <<
DEL /F apps\\$shlib$shlibext DEL /Q /F apps\\$shlib$shlibext
DEL /F test\\$shlib$shlibext DEL /Q /F test\\$shlib$shlibext
COPY $shlib$shlibext apps COPY $shlib$shlibext apps
COPY $shlib$shlibext test COPY $shlib$shlibext test
EOF EOF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册