summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiod <>2014-05-04 17:12:19 +0000
committermiod <>2014-05-04 17:12:19 +0000
commit88db645e22fb1c253e1047f2136eab712b28bccb (patch)
treeeba1bc99ad418bc00da6a051deaf53b63cccab3d /src
parent1a9331752b9325bb1861f88d4ce331a66ba20f23 (diff)
downloadopenbsd-88db645e22fb1c253e1047f2136eab712b28bccb.tar.gz
openbsd-88db645e22fb1c253e1047f2136eab712b28bccb.tar.bz2
openbsd-88db645e22fb1c253e1047f2136eab712b28bccb.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/crypto/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 5554b0382c..5fefdb1cf0 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.30 2014/05/01 17:08:57 miod Exp $ 1# $OpenBSD: Makefile,v 1.31 2014/05/04 17:12:19 miod Exp $
2 2
3LIB= crypto 3LIB= crypto
4 4
@@ -427,9 +427,7 @@ obj_dat.h: obj_mac.h
427 427
428.if exists (${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc) 428.if exists (${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc)
429.include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc" 429.include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc"
430.endif 430.else
431
432.if !defined(SSLASM)
433CFLAGS+=-DOPENSSL_NO_ASM 431CFLAGS+=-DOPENSSL_NO_ASM
434SRCS+= aes_core.c aes_cbc.c 432SRCS+= aes_core.c aes_cbc.c
435SRCS+= bf_enc.c 433SRCS+= bf_enc.c