Commit ae6cb548 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Use || instead of && so build doesn't fail.

parent a168ec1d

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ build_testapps: 
	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)



fips_premain_dso$(EXE_EXT): libcrypto.a

	[ -n "$(FIPSCANLIB)" ] && $(CC) $(CFLAGS) \

	[ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAGS) \

		-DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \

		$(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \

		libcrypto.a $(EX_LIBS)

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ lib: $(LIB) 
	@touch lib

$(LIB):	$(LIBOBJ)

	$(AR) $(LIB) $(LIBOBJ)

	[ -n "$(FIPSLIBDIR)" ] && $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o

	[ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o

	$(RANLIB) $(LIB) || echo Never mind.



shared: buildinf.h lib subdirs