From: Andy Polyakov <appro@openssl.org>
Date: Fri, 19 Feb 2016 12:41:58 +0000 (+0100)
Subject: Makefile.shared: limit .dll image base pinning to FIPS builds.
X-Git-Tag: OpenSSL_1_1_0-pre4~585
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=464dadb29db534981330cddec43336108cbb0f65;hp=dfb10af92e9663ce4eefaa1d6b678817fa85344d;ds=sidebyside

Makefile.shared: limit .dll image base pinning to FIPS builds.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/Makefile.shared b/Makefile.shared
index 57e1936b9e..7a89019d4b 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -295,7 +295,7 @@ link_shlib.mingw:
 	SHLIB_SOVER=-$$sover$$arch; \
 	SHLIB_SUFFIX=.dll; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
-	base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+	base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \
 	$(PERL) $(SRCDIR)/util/mkdef.pl 32 $(LIBNAME) \
 		| sed -e 's|^\(LIBRARY  *\)$(LIBNAME)32|\1'"$$dll_name"'|' \
 		> $(LIBNAME).def; \