Remove fipscanister build functionality from makefiles.

Reviewed-by: Tim Hudson <tjh@openssl.org>
2014-10-18 23:47:03 +01:00 · 2014-10-18 23:47:03 +01:00 · f072785eb4
commit f072785eb4
parent 78c990c156
56 changed files with 62 additions and 82 deletions
--- a/Makefile.org
+++ b/Makefile.org
@ -78,7 +78,7 @@ LIBDIR=lib
 # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
 # gcc, then the driver will automatically translate it to -xarch=v8plus
 # and pass it down to assembler.
-#AS=$(CC) -c
+AS=$(CC) -c
 ASFLAG=$(CFLAG)

 # For x86 assembler: Set PROCESSOR to 386 if you want to support
@ -121,15 +121,9 @@ LIBZLIB=

 FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/

-# This is set to "y" if fipscanister.o is compiled internally as
-# opposed to coming from an external validated location.
-
-FIPSCANISTERINTERNAL=n
-
 # The location of the library which contains fipscanister.o
-# normally it will be libcrypto unless fipsdso is set in which
-# case it will be libfips. If not compiling in FIPS mode at all
-# this is empty making it a useful test for a FIPS compile.
+# normally it will be libcrypto. If not compiling in FIPS mode
+# at all this is empty making it a useful test for a FIPS compile.

 FIPSCANLIB=

@ -207,7 +201,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\

 BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
-		ASFLAG='$(CFLAG) -c'			\
+		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
 		CROSS_COMPILE='$(CROSS_COMPILE)'	\
 		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
@ -357,24 +351,10 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools

-build_libs: build_crypto build_fips build_ssl build_engines
-
-build_fips:
-	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
+build_libs: build_crypto build_ssl build_engines

 build_crypto:
-	if [ -n "$(FIPSCANLIB)" ]; then \
-		EXCL_OBJ='$(AES_ENC) $(BN_ASM) $(EC_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(MODES_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
-		ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
-	else \
-		ARX='${AR}' ; \
-	fi ; export ARX ; \
-	if [ $(FIPSCANISTERINTERNAL) = "y" ]; then \
-		AS='$(PERL) $${TOP}/util/fipsas.pl $${TOP} $${<} $(CC) -c' ; \
-	else \
-		AS='$(CC) -c' ; \
-	fi ; export AS ; \
-		dir=crypto; target=all; $(BUILD_ONE_CMD)
+	@dir=crypto; target=all; $(BUILD_ONE_CMD)
 build_ssl:
 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
 build_engines:
@ -390,7 +370,7 @@ all_testapps: build_libs build_testapps
 build_testapps:
 	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)

-libcrypto$(SHLIB_EXT): libcrypto.a build_fips
+libcrypto$(SHLIB_EXT): libcrypto.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 		if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
 			FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
--- a/crypto/Makefile
+++ b/crypto/Makefile
@ -109,7 +109,7 @@ links:
 lib:	$(LIB)
 	@touch lib
 $(LIB):	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.

 shared: buildinf.h lib subdirs
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@ -41,7 +41,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@ -67,7 +67,7 @@ pk:	pk.c
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@ -38,7 +38,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/bio/Makefile
+++ b/crypto/bio/Makefile
@ -45,7 +45,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@ -56,7 +56,7 @@ bnbug: bnbug.c ../../libcrypto.a top
 	cc -g -I../../include bnbug.c -o bnbug ../../libcrypto.a

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/camellia/Makefile
+++ b/crypto/camellia/Makefile
@ -40,7 +40,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/cast/Makefile
+++ b/crypto/cast/Makefile
@ -38,7 +38,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/cmac/Makefile
+++ b/crypto/cmac/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/cms/Makefile
+++ b/crypto/cms/Makefile
@ -39,7 +39,7 @@ test:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/comp/Makefile
+++ b/crypto/comp/Makefile
@ -36,7 +36,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/conf/Makefile
+++ b/crypto/conf/Makefile
@ -36,7 +36,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@ -52,7 +52,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@ -35,7 +35,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@ -35,7 +35,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/dso/Makefile
+++ b/crypto/dso/Makefile
@ -35,7 +35,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@ -44,7 +44,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ecdh/Makefile
+++ b/crypto/ecdh/Makefile
@ -34,7 +34,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@ -34,7 +34,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@ -43,7 +43,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@ -57,7 +57,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/hmac/Makefile
+++ b/crypto/hmac/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/idea/Makefile
+++ b/crypto/idea/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@ -17,7 +17,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/krb5/Makefile
+++ b/crypto/krb5/Makefile
@ -34,7 +34,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/lhash/Makefile
+++ b/crypto/lhash/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/md2/Makefile
+++ b/crypto/md2/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@ -34,7 +34,7 @@ top:
 all:    lib

 lib:    $(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@ -38,7 +38,7 @@ top:
 all:    lib

 lib:    $(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@ -40,7 +40,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@ -34,7 +34,7 @@ top:
 all:	obj_dat.h obj_xref.h lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@ -36,7 +36,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@ -36,7 +36,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/pkcs12/Makefile
+++ b/crypto/pkcs12/Makefile
@ -39,7 +39,7 @@ test:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/pkcs7/Makefile
+++ b/crypto/pkcs7/Makefile
@ -40,7 +40,7 @@ test:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/pqueue/Makefile
+++ b/crypto/pqueue/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@ -35,7 +35,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/rc2/Makefile
+++ b/crypto/rc2/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@ -37,7 +37,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/rc5/Makefile
+++ b/crypto/rc5/Makefile
@ -38,7 +38,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ripemd/Makefile
+++ b/crypto/ripemd/Makefile
@ -38,7 +38,7 @@ top:
 all:    lib

 lib:    $(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@ -39,7 +39,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/seed/Makefile
+++ b/crypto/seed/Makefile
@ -34,7 +34,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@ -38,7 +38,7 @@ top:
 all:    lib

 lib:    $(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/stack/Makefile
+++ b/crypto/stack/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/store/Makefile
+++ b/crypto/store/Makefile
@ -35,7 +35,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ts/Makefile
+++ b/crypto/ts/Makefile
@ -47,7 +47,7 @@ test:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/txt_db/Makefile
+++ b/crypto/txt_db/Makefile
@ -33,7 +33,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@ -37,7 +37,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@ -38,7 +38,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@ -43,7 +43,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib

--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@ -43,7 +43,7 @@ top:
 all:	lib

 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib