From 2600f312d75bcee1656640f5b6062ec35d5abb3c Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Sun, 4 Mar 2001 05:51:43 +0000 Subject: [PATCH] Don't override CPUTYPE (actually this predates the use of CPUTYPE, and I forgot I used it here already) Pointed out by: bde --- secure/lib/libcrypto/Makefile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index b1b0375d8dc..8f41acee3ea 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -368,28 +368,18 @@ beforeinstall: openssl/opensslconf.h openssl/evp.h .include -# 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: