Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix botched commit (a conflict was committed).

Browse Source
This commit is contained in:
matt 2001-08-05 03:37:37 +00:00
parent cce919e025
commit 799202c512
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.177 2001/08/04 18:41:18 tsutsui Exp $ # $NetBSD: Makefile,v 1.178 2001/08/05 03:37:37 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values: # Environment variables without default values:
@ -116,22 +116,6 @@ PCS= pcs750.bin
# find out endianness of target and set proper flag for pwd_mkdb so that # find out endianness of target and set proper flag for pwd_mkdb so that
# it creates database in same endianness # it creates database in same endianness
<<<<<<< Makefile
.if (${MACHINE_ARCH} == "alpha") || \
(${MACHINE_ARCH} == "arm26") || \
(${MACHINE_ARCH} == "arm32") || \
(${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "mipsel") || \
(${MACHINE_ARCH} == "ns32k") || \
(${MACHINE_ARCH} == "vax")
TARGET_ENDIANNESS?= -L
.elif (${MACHINE_ARCH} == "m68k") || \
(${MACHINE_ARCH} == "mipseb") || \
(${MACHINE_ARCH} == "powerpc") || \
(${MACHINE_ARCH} == "sparc") || \
(${MACHINE_ARCH} == "sparc64")
TARGET_ENDIANNESS?= -B
=======
.if exists(${DESTDIR}/usr/include/machine/endian_machdep.h) .if exists(${DESTDIR}/usr/include/machine/endian_machdep.h)
TARGET_ENDIANNESS!= \ TARGET_ENDIANNESS!= \
( echo "\#include <machine/endian_machdep.h>" ; echo _BYTE_ORDER ) | \ ( echo "\#include <machine/endian_machdep.h>" ; echo _BYTE_ORDER ) | \
@ -144,7 +128,6 @@ TARGET_ENDIANNESS=
TARGET_ENDIANNESS= -L TARGET_ENDIANNESS= -L
.elif ${TARGET_ENDIANNESS} == "_BIG_ENDIAN" .elif ${TARGET_ENDIANNESS} == "_BIG_ENDIAN"
TARGET_ENDIANNESS= -B TARGET_ENDIANNESS= -B
>>>>>>> 1.176
.else .else
# XXX sh3 should be split into sh3eb and sh3el # XXX sh3 should be split into sh3eb and sh3el
TARGET_ENDIANNESS= TARGET_ENDIANNESS=