From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 30 Jan 2011 01:14:34 +0000 (+0000)
Subject: Fix shared build for fips
X-Git-Tag: OpenSSL-fips-2_0-rc1~821
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=225c272193413b727cfffe2ac03a9bb5888459be;p=oweals%2Fopenssl.git

Fix shared build for fips
---

diff --git a/Makefile.org b/Makefile.org
index ddc4e827c1..ad956476d5 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -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; \