From: Andy Polyakov <appro@openssl.org>
Date: Fri, 19 Feb 2016 12:40:58 +0000 (+0100)
Subject: Makefile.shared: limit .dll image base pinning to FIPS builds.
X-Git-Tag: OpenSSL_1_0_2g~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c575ceffdbc38a32f1229cf30d901403c9361334;p=oweals%2Fopenssl.git

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

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/Makefile.shared b/Makefile.shared
index e753f44e18..5fe14e6970 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -289,7 +289,7 @@ link_a.cygwin:
 		SHLIB_SOVER=32; \
 		extras="$(LIBNAME).def"; \
 		$(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
-		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+		base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \
 	fi; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
 	$(PERL) util/mkrc.pl $$dll_name | \