summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornaddy <>2010-10-04 19:15:40 +0000
committernaddy <>2010-10-04 19:15:40 +0000
commit9f652c507315eb7637f7e01014c0e4c7324ddbb1 (patch)
tree9418a9dc357787bf20c1e0efde6b913a1873e221 /src
parentfd28be256fa5fdd70fc81faf9cdca7a607a16c7a (diff)
downloadopenbsd-9f652c507315eb7637f7e01014c0e4c7324ddbb1.tar.gz
openbsd-9f652c507315eb7637f7e01014c0e4c7324ddbb1.tar.bz2
openbsd-9f652c507315eb7637f7e01014c0e4c7324ddbb1.zip
Our make already uses sh -e when executing commands.
Revert the "set -e" additions and kill unneeded subshells. ok djm@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/crypto/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index cdb94a2931..93657a0bb8 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.55 2010/10/02 07:42:02 djm Exp $ 1# $OpenBSD: Makefile,v 1.56 2010/10/04 19:15:40 naddy Exp $
2 2
3LIB= crypto 3LIB= crypto
4WANTLINT= 4WANTLINT=
@@ -532,20 +532,20 @@ SSLASM=\
532SRCS+= ${f}.S 532SRCS+= ${f}.S
533GENERATED+=${f}.S 533GENERATED+=${f}.S
534${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl 534${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
535 (set -e ; cd ${LCRYPTO_SRC}/${dir} ; \ 535 (cd ${LCRYPTO_SRC}/${dir} ; \
536 /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET} 536 /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET}
537.endfor 537.endfor
538SRCS+= x86_64cpuid.S sha256-x86_64.S sha512-x86_64.S 538SRCS+= x86_64cpuid.S sha256-x86_64.S sha512-x86_64.S
539GENERATED+=x86_64cpuid.S sha256-x86_64.S sha512-x86_64.S 539GENERATED+=x86_64cpuid.S sha256-x86_64.S sha512-x86_64.S
540x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl 540x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl
541 (set -e ; cd ${LCRYPTO_SRC}/${dir} ; \ 541 (cd ${LCRYPTO_SRC}/${dir} ; \
542 /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET} 542 /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET}
543sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl 543sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
544 (set -e ; cd ${LCRYPTO_SRC}/sha/asm ; \ 544 cd ${LCRYPTO_SRC}/sha/asm ; \
545 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}) 545 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
546sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl 546sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
547 (set -e ; cd ${LCRYPTO_SRC}/sha/asm ; \ 547 cd ${LCRYPTO_SRC}/sha/asm ; \
548 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}) 548 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
549.else 549.else
550# XXX ppccpuid.pl 550# XXX ppccpuid.pl
551CFLAGS+=-DOPENSSL_NO_ASM 551CFLAGS+=-DOPENSSL_NO_ASM