Re: 5.0_BETA build error on amd64

[FUKAUMI Naoki <fun%naobsd.org@localhost>]

At Sun, 18 Jan 2009 22:01:26 +0900,
FUKAUMI Naoki wrote:
> > I got error while building 5.0_BETA with today's source.
> (snip)
> 
> with today's source...
> 
> # ident /usr/src/doc/CHANGES-5.0 /usr/src/gnu/usr.bin/binutils/ld/Makefile
> /usr/src/doc/CHANGES-5.0:
>      $NetBSD: CHANGES-5.0,v 1.1.2.76 2009/01/17 23:01:15 snj Exp $
> 
> /usr/src/gnu/usr.bin/binutils/ld/Makefile:
>      $NetBSD: Makefile,v 1.27.2.2 2009/01/17 21:49:10 snj Exp $
> 
> cleandir ===> gnu/usr.bin/binutils/ld
> nbmake: "/usr/src/gnu/usr.bin/binutils/ld/Makefile" line 76: Malformed 
> conditional (elf_x86_64 == "elf_i386" || elf_x86_64 == "i386nbsd")
> nbmake: "/usr/src/gnu/usr.bin/binutils/ld/Makefile" line 76: Need an operator
> nbmake: "/usr/src/gnu/usr.bin/binutils/ld/Makefile" line 76: Malformed 
> conditional (elf_i386 == "elf_i386" || elf_i386 == "i386nbsd")
> nbmake: "/usr/src/gnu/usr.bin/binutils/ld/Makefile" line 76: Need an operator
> nbmake: "/usr/src/gnu/usr.bin/binutils/ld/Makefile" line 76: Malformed 
> conditional (i386nbsd == "elf_i386" || i386nbsd == "i386nbsd")
> nbmake: "/usr/src/gnu/usr.bin/binutils/ld/Makefile" line 76: Need an operator
> nbmake: Fatal errors encountered -- cannot continue

attached patch fixes this problem. (back out 1.27.2.2 & "${f}")

--
FUKAUMI Naoki

Index: Makefile
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/src/gnu/usr.bin/binutils/ld/Makefile,v
retrieving revision 1.27.2.2
diff -u -r1.27.2.2 Makefile
--- Makefile    17 Jan 2009 21:49:10 -0000      1.27.2.2
+++ Makefile    18 Jan 2009 13:14:15 -0000
@@ -75,15 +75,14 @@
 CLEANFILES+=   .depend.${f} e${f}.c
 
 # XXX super hack
-EMUL_LIB_PATH.${f}:=/usr/lib
-. if ${MACHINE_ARCH} == "x86_64"
-.  if ${f} == "elf_i386" || ${f} == "i386nbsd"
-EMUL_LIB_PATH.${f}:=/usr/lib/i386
-.  endif
-. elif ${MACHINE_ARCH} == "sparc64"
-.  if ${f} == "elf32_sparc" || ${f} == "sparcnbsd"
-EMUL_LIB_PATH.${f}:=/usr/lib/sparc
-.  endif
+. if (${MACHINE_ARCH} == "x86_64" && \
+      ("${f}" == "elf_i386" || "${f}" == "i386nbsd"))
+EMUL_LIB_PATH.${f}=/usr/lib/i386
+. elif (${MACHINE_ARCH} == "sparc64" && \
+      ("${f}" == "elf32_sparc" || "${f}" == "sparcnbsd"))
+EMUL_LIB_PATH.${f}=/usr/lib/sparc
+. else
+EMUL_LIB_PATH.${f}=/usr/lib
 . endif
 
 e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed