Commit 3b2e785e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make test utilities build in non-FIPS compiles.

parent 280bc447

test/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ 
	fi; \

	if [ "$(FIPSCANLIB)" = "libfips" ]; then \

		LIBRARIES="-L$(TOP) -lfips"; \

	else \

	elif [ -n "$(FIPSCANLIB)" ]; then \

		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \

		LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \

	fi; \
@@ -407,7 +407,7 @@ FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ 
		shlib_target="$(SHLIB_TARGET)"; \

	fi; \

	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \

	if [ -z "$(SHARED_LIBS)" ] ; then \

	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \

		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \

	fi; \

	[ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \