From 974c31ca77a17d6865d71ee310f5754624876fe2 Mon Sep 17 00:00:00 2001 From: miod <> Date: Sun, 4 May 2014 17:12:19 +0000 Subject: [PATCH] Remove the !SSLASM conditional. Either there is an arch-specific Makefile.inc, or the !SSLASM list of files applies. This allows for an arch-specific Makefile.inc to not specify SSLASM. --- src/lib/libcrypto/crypto/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index 5554b038..5fefdb1c 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2014/05/01 17:08:57 miod Exp $ +# $OpenBSD: Makefile,v 1.31 2014/05/04 17:12:19 miod Exp $ LIB= crypto @@ -427,9 +427,7 @@ obj_dat.h: obj_mac.h .if exists (${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc) .include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc" -.endif - -.if !defined(SSLASM) +.else CFLAGS+=-DOPENSSL_NO_ASM SRCS+= aes_core.c aes_cbc.c SRCS+= bf_enc.c