From: Richard Levitte <levitte@openssl.org>
Date: Wed, 16 Mar 2016 14:32:44 +0000 (+0100)
Subject: DLL object files should not be built with /Zl"
X-Git-Tag: OpenSSL_1_1_0-pre4~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8975fb62122250440e9bc00c6e985e3a708473bb;p=oweals%2Fopenssl.git

DLL object files should not be built with /Zl"

When building the DLLs, we depend on the correct default C RTL info.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f9c838c259..e2fcf0c1c8 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1238,7 +1238,9 @@ sub vc_wince_info {
         cc               => "cl",
         cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
         coutflag         => "/Fo",
-        lib_cflags       => "/Zl /Zi /Fdlib",
+        lib_cflags       => sub { join(" ",
+                                       ($disabled{shared} ? "/Zl" : ()),
+                                       "/Zi /Fdlib") },
         dso_cflags       => "/Zi",
         bin_cflags       => "/Zi /Fdapp",
         lflags           => add("/debug"),