Fix shared build for fips
authorDr. Stephen Henson <steve@openssl.org>
Sun, 30 Jan 2011 01:14:34 +0000 (01:14 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 30 Jan 2011 01:14:34 +0000 (01:14 +0000)
Makefile.org

index ddc4e82..ad95647 100644 (file)
@@ -369,8 +369,12 @@ all_testapps: build_libs build_testapps
 build_testapps:
        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a
+libcrypto$(SHLIB_EXT): libcrypto.a build_fips
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
+               if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+                       FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+                       export CC FIPSLD_CC; \
+               fi; \
                $(MAKE) SHLIBDIRS=crypto build-shared; \
        else \
                echo "There's no support for shared libraries on this platform" >&2; \