Makefile.shared: limit .dll image base pinning to FIPS builds.
authorAndy Polyakov <appro@openssl.org>
Fri, 19 Feb 2016 12:40:58 +0000 (13:40 +0100)
committerAndy Polyakov <appro@openssl.org>
Fri, 19 Feb 2016 12:40:58 +0000 (13:40 +0100)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Makefile.shared

index e753f44e18fdf6878a25024e5939f6f0d7db6305..5fe14e6970b82981ac6919d35befd3cdb48ad5bd 100644 (file)
@@ -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 | \