Makefile.org: make FIPS build work with BSD make.
authorAndy Polyakov <appro@openssl.org>
Sun, 10 Nov 2013 22:06:41 +0000 (23:06 +0100)
committerAndy Polyakov <appro@openssl.org>
Sun, 10 Nov 2013 22:08:25 +0000 (23:08 +0100)
(cherry picked from commit 60adefa61025ffd7d56cf7ff8491008f783282bf)

Makefile.org

index 2db31ead6fa9fa3565b9bf84119023fb8e5f6775..0368ed950892e3216a20a26fa43346fa85f991c7 100644 (file)
@@ -302,7 +302,8 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
                        FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
                        export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
                fi; \
-               $(MAKE) -e SHLIBDIRS=crypto build-shared; \
+               $(MAKE) -e SHLIBDIRS=crypto  CC=$${CC:-$(CC)} build-shared; \
+               touch -c fips_premain_dso($EXE_EXT); \
        else \
                echo "There's no support for shared libraries on this platform" >&2; \
                exit 1; \