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
This commit is contained in:
Kris Kennaway 2001-03-04 05:51:43 +00:00
parent 0d2e2e23c1
commit 2600f312d7
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=73420

View file

@ -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: