diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-09-17 15:56:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-09-17 15:56:42 +0000 |
| commit | 52702f6f9255fb59001153f9885889db1eafd6b6 (patch) | |
| tree | f104a1d8878c0532eaab9ef1035e51a56365c657 /apps | |
| parent | 05794d983f7758a168bf8459ca384ece38e5dc45 (diff) | |
Updates to build system from FIPS branch. Make fipscanisterbuild work and
build FIPS test programs.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/Makefile b/apps/Makefile index 7eade4e274..798bfc9eee 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -152,10 +152,13 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) $(RM) $(EXE) 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; \ fi; \ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ + [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ - 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 ..; \ |