aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.shared
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2016-02-19 13:41:58 +0100
committerAndy Polyakov <appro@openssl.org>2016-02-19 21:11:21 +0100
commit464dadb29db534981330cddec43336108cbb0f65 (patch)
treed8d75f432ba748a08ce12a3c6247e52d39dcc585 /Makefile.shared
parentdfb10af92e9663ce4eefaa1d6b678817fa85344d (diff)
downloadopenssl-464dadb29db534981330cddec43336108cbb0f65.tar.gz
Makefile.shared: limit .dll image base pinning to FIPS builds.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'Makefile.shared')
-rw-r--r--Makefile.shared2
1 files changed, 1 insertions, 1 deletions
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; \