The branch master has been updated
via 464dadb29db534981330cddec43336108cbb0f65 (commit)
from dfb10af92e9663ce4eefaa1d6b678817fa85344d (commit)
- Log -----------------------------------------------------------------
commit 464dadb29db534981330cddec43336108cbb0f65
Author: Andy Polyakov <[email protected]>
Date: Fri Feb 19 13:41:58 2016 +0100
Makefile.shared: limit .dll image base pinning to FIPS builds.
Reviewed-by: Tim Hudson <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile.shared | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.shared b/Makefile.shared
index 57e1936..7a89019 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; \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
