summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-16 16:50:08 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-16 16:50:08 +0000
commit0dc1b3c1fbe58088e6922b6df793ade0e637ad82 (patch)
treea4bb4ffce6c3fa247afa0de271edf96345a2a60c /apps
parent1e53b797f65ef6d3c2eb1052797683fec27a9ff5 (diff)
PR: 1957
Submitted by: Mark Ashley <mark@ibiblio.org> Reviewed by: steve@openssl.org Quote FIPSLD_CC and CC in Makefiles.
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 402981aede..06d53512b2 100644
--- 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 ..; \