Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Apr 2003 18:19:29 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 30218 for review
Message-ID:  <200305010119.h411JTdA062309@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30218

Change 30218 by peter@peter_daintree on 2003/04/30 18:19:03

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/boot/Makefile#5 edit

Differences ...

==== //depot/projects/hammer/sys/boot/Makefile#5 (text+ko) ====

@@ -5,11 +5,6 @@
 MACHINE=i386
 .endif
 
-.if ${MACHINE_ARCH} == "amd64"
-MACHINE_ARCH=i386
-MACHINE=i386
-.endif
-
 .if !defined(NOFORTH)
 # Build the add-in FORTH interpreter
 SUBDIR+=		ficl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305010119.h411JTdA062309>