From: miod <miod@openbsd.org>
Date: Sun, 4 May 2014 17:12:19 +0000 (+0000)
Subject: Remove the !SSLASM conditional. Either there is an arch-specific Makefile.inc,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7653c0c18e4be3ac91ffb28d3f0e2e088c24b6ac;p=openbsd

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.
---

diff --git a/lib/libcrypto/crypto/Makefile b/lib/libcrypto/crypto/Makefile
index 5554b0382c2..5fefdb1cf0b 100644
--- a/lib/libcrypto/crypto/Makefile
+++ b/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