summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2016-02-19 13:40:58 +0100
committerAndy Polyakov <appro@openssl.org>2016-02-19 13:40:58 +0100
commitc575ceffdbc38a32f1229cf30d901403c9361334 (patch)
tree0d0d2299dfe71f8fb1897c4e710a3627417803ac
parentb393a4ad38093f54a0e7251ac8694e320a150e12 (diff)
Makefile.shared: limit .dll image base pinning to FIPS builds.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--Makefile.shared2
1 files changed, 1 insertions, 1 deletions
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 | \