Commit 0dc1b3c1 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1957 

Submitted by: Mark Ashley <mark@ibiblio.org>
Reviewed by: steve@openssl.org

Quote FIPSLD_CC and CC in Makefiles.
parent 1e53b797

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) 
			$(AR) libcrypto.a fips/fipscanister.o ; \

		else \

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

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

				FIPSLD_CC="$(CC)"; CC=fips/fipsld; \

				export CC FIPSLD_CC; \

			fi; \

			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
@@ -380,7 +380,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a 
fips/fipscanister.o:	build_fips

libfips$(SHLIB_EXT):		fips/fipscanister.o

	@if [ "$(SHLIB_TARGET)" != "" ]; then \

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

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

		$(MAKE) -f Makefile.shared -e $(BUILDENV) \

			CC=$${CC} LIBNAME=fips THIS=$@ \

			LIBEXTRAS=fips/fipscanister.o \

apps/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \

		shlib_target="$(SHLIB_TARGET)"; \

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

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

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

	fi; \

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

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

	$(MAKE) -f $(TOP)/Makefile.shared -e \

		CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \

		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \

		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

		link_app.$${shlib_target}

	-(cd ..; \