PR: 1957

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

Quote FIPSLD_CC and CC in Makefiles.

diff --git a/Makefile.org b/Makefile.org
index d1b56b2f580f5106036d513042222a8e44557542..06b942fa5c085cf1751f1b670b45db3dc7995077 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -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 \

diff --git a/apps/Makefile b/apps/Makefile
index 402981aedeab134a061d54e05c4ef556850343ea..06d53512b22a8b4e689a2da8f8cc6823d9f9fe2b 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -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 ..; \