diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-05-16 09:48:15 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-05-16 11:15:57 +0200 |
| commit | 592b6fb489c97be2b039ab671647aa58a472204a (patch) | |
| tree | 5b49ef8da3beba500f20ef1d7fc4e69863c096b8 | |
| parent | 4e0e4d293753a67e5771c98ec312a37ca54cc3b0 (diff) | |
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: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1075)
| -rw-r--r-- | Configurations/10-main.conf | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index f928d1f2b5..84d33232a5 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1267,7 +1267,7 @@ sub vms_info { release => sub { ($disabled{shared} ? "" : "/MD") - ." /Ox /O2 /Ob2"; + ." /O2"; })), lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }), # Following might/should appears controversial, i.e. defining diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 408a87fc6e..b04d850e6d 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -168,7 +168,7 @@ uninstall: uninstall_docs uninstall_sw libclean: $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS) -del /Q /F $(LIBS) - -del ossl_static.pdb + -del /Q ossl_static.pdb clean: libclean -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS) @@ -195,6 +195,8 @@ uninstall_docs: install_ssldirs: @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs" @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private" + @$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\apps\openssl.cnf \ + "$(DESTDIR)$(OPENSSLDIR)" install_dev: @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @@ -390,8 +392,8 @@ $target: $deps $ordinalsfile $mkdef_pl /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1) $objs $shlib.res$linklibs \$(EX_LIBS) << - DEL /F apps\\$shlib$shlibext - DEL /F test\\$shlib$shlibext + DEL /Q /F apps\\$shlib$shlibext + DEL /Q /F test\\$shlib$shlibext COPY $shlib$shlibext apps COPY $shlib$shlibext test EOF |