Make test utility link work for fips build.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 26 May 2011 14:36:56 +0000 (14:36 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 26 May 2011 14:36:56 +0000 (14:36 +0000)
test/Makefile

index f87ae7a..12694dc 100644 (file)
@@ -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}