summaryrefslogtreecommitdiffstats
path: root/secure/lib
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2001-03-04 05:51:43 +0000
committerkris <kris@FreeBSD.org>2001-03-04 05:51:43 +0000
commit35583224c700ea795d0000e00b57a46e7f96d2fb (patch)
tree920c5b9440b98b2ed4e7e410bf2b3a34dd5c2d63 /secure/lib
parent5a48882c7cb95e673e7b25583eb9cd1d8a5ad3b5 (diff)
downloadFreeBSD-src-35583224c700ea795d0000e00b57a46e7f96d2fb.zip
FreeBSD-src-35583224c700ea795d0000e00b57a46e7f96d2fb.tar.gz
Don't override CPUTYPE (actually this predates the <bsd.cpu.mk> use of
CPUTYPE, and I forgot I used it here already) Pointed out by: bde
Diffstat (limited to 'secure/lib')
-rw-r--r--secure/lib/libcrypto/Makefile16
1 files changed, 3 insertions, 13 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index b1b0375..8f41ace 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -368,28 +368,18 @@ beforeinstall: openssl/opensslconf.h openssl/evp.h
.include <bsd.lib.mk>
-# If we don't want 686/586 asm, use the "386" modifier to the perl scripts to give
-# compatible output
-.if !defined(NOPERL) && ${MACHINE_ARCH} == "i386"
-.if ${MACHINE_CPU:Mi686} || ${MACHINE_CPU:Mi586}
-CPUTYPE=
-.elif ${MACHINE_CPU:Mi386}
-CPUTYPE= 386
-.endif
-.endif
-
.if !defined(NOPERL) && ${MACHINE_ARCH} == "i386"
.SUFFIXES: .o .pl
.SUFFIXES: .po .pl
.SUFFIXES: .So .pl
.pl.o:
- perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE} > $(.PREFIX).pl.s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
+ perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE:Mi386:S/i//} > $(.PREFIX).pl.s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
.pl.po:
- perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE} > $(.PREFIX).pl.s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
+ perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE:Mi386:S/i//} > $(.PREFIX).pl.s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
.pl.So:
- perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE} > $(.PREFIX).pl.s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
+ perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE:Mi386:S/i//} > $(.PREFIX).pl.s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
.endif
afterinstall:
OpenPOWER on IntegriCloud