From 464dadb29db534981330cddec43336108cbb0f65 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 19 Feb 2016 13:41:58 +0100 Subject: [PATCH 1/1] Makefile.shared: limit .dll image base pinning to FIPS builds. Reviewed-by: Tim Hudson --- Makefile.shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; \ -- 2.34.1