diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libssl/test | |
| parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
| download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libssl/test')
| -rw-r--r-- | src/lib/libssl/test/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libssl/test/Makefile b/src/lib/libssl/test/Makefile index 73d64440b1..228ee368cd 100644 --- a/src/lib/libssl/test/Makefile +++ b/src/lib/libssl/test/Makefile | |||
| @@ -404,6 +404,8 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ | |||
| 404 | elif [ -n "$(FIPSCANLIB)" ]; then \ | 404 | elif [ -n "$(FIPSCANLIB)" ]; then \ |
| 405 | FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ | 405 | FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ |
| 406 | LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ | 406 | LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ |
| 407 | else \ | ||
| 408 | LIBRARIES="$(LIBCRYPTO)"; \ | ||
| 407 | fi; \ | 409 | fi; \ |
| 408 | $(MAKE) -f $(TOP)/Makefile.shared -e \ | 410 | $(MAKE) -f $(TOP)/Makefile.shared -e \ |
| 409 | CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ | 411 | CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ |