2010-01-28 19:27:53 +00:00
|
|
|
--- a/Makefile.org
|
|
|
|
|
+++ b/Makefile.org
|
|
|
|
|
@@ -357,7 +357,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHA
|
2009-04-11 16:25:09 +00:00
|
|
|
$(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; \
|
2010-01-28 19:27:53 +00:00
|
|
|
@@ -380,7 +380,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT
|
2009-04-11 16:25:09 +00:00
|
|
|
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 \
|
2010-01-28 19:27:53 +00:00
|
|
|
--- a/apps/Makefile
|
|
|
|
|
+++ b/apps/Makefile
|
|
|
|
|
@@ -153,12 +153,12 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(
|
2009-04-11 16:25:09 +00:00
|
|
|
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 ..; \
|
