From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 26 May 2011 14:36:56 +0000 (+0000)
Subject: Make test utility link work for fips build.
X-Git-Tag: OpenSSL_1_0_1-beta1~293
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2a351443276ea827c7716eb0e25933ed88444afb;p=oweals%2Fopenssl.git

Make test utility link work for fips build.
---

diff --git a/test/Makefile b/test/Makefile
index f87ae7adb4..12694dc40a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -344,8 +344,11 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 		shlib_target="$(SHLIB_TARGET)"; \
 	fi; \
 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
+	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
+		FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; export CC FIPSLD_CC; \
+	fi; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \
-		APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		link_app.$${shlib_target}