From owner-freebsd-current@FreeBSD.ORG Sat Nov 13 20:27:34 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8D6B106566C; Sat, 13 Nov 2010 20:27:34 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 467548FC15; Sat, 13 Nov 2010 20:27:33 +0000 (UTC) Received: by wyb36 with SMTP id 36so1197141wyb.13 for ; Sat, 13 Nov 2010 12:27:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=YI/xM2rtWOlsSEcOuQn5zm5t0DZeNDBIZyxJU6e7VGE=; b=oy/q2PLCdqUt7wS0eoaMYCqjJBY4Br9Gc7rdWDOf2JNNjKCKGjQanZWHak/vSjZnXg 36aljDH6J+9LbiKVFGl+ZYdhuNkoOPojPZMXwNELbR1bTqO21Scgw5AGtUBGanQNzCQf 9zv0N1qa7IDtZDHwkMNy9BEDBtWkSAvtotW94= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; b=uu4+KSwNiy86kmJbeSEbyLoFw7CrqGNMnw6m4r/Xq3v/GLZLM/JbYyz1gpRfGTwcxu nsuJV6hnCnjE1VIy88Rles/EvAKI0bZIovOFKglma0F/L5YjnvBYRf3RbCrOLOSiLqRj sbNRpLULH9n2bXPHSN0lx66EssDVYYy123tJE= MIME-Version: 1.0 Received: by 10.216.175.18 with SMTP id y18mr3949267wel.30.1289680053013; Sat, 13 Nov 2010 12:27:33 -0800 (PST) Sender: yanegomi@gmail.com Received: by 10.216.198.27 with HTTP; Sat, 13 Nov 2010 12:27:32 -0800 (PST) Date: Sat, 13 Nov 2010 12:27:32 -0800 X-Google-Sender-Auth: dfs28oX4MG-_MYtTafbu_2W3_w8 Message-ID: From: Garrett Cooper To: Warner Losh Content-Type: text/plain; charset=ISO-8859-1 Cc: FreeBSD Current Subject: [PATCH] Unbreak buildworld post-r215254 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2010 20:27:34 -0000 Looks like buildworld is broken when TARGET/TARGET_ARCH isn't specified: $ make buildworld "/usr/src/Makefile.inc1", line 127: Malformed conditional (${TARGET_ARCH} == "mips" && ${TARGET} == "mips") "/usr/src/Makefile.inc1", line 128: warning: "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb" "/usr/src/Makefile.inc1", line 134: if-less endif "/usr/src/Makefile.inc1", line 152: Unknown target mipsel:amd64. *** Error code 1 This change fixed it: $ svn diff Makefile.inc1 Index: Makefile.inc1 =================================================================== --- Makefile.inc1 (revision 215254) +++ Makefile.inc1 (working copy) @@ -124,7 +124,8 @@ TARGET= ${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm} .endif # Legacy names, for a transition period mips:mips -> mipsel:mips -.if ${TARGET_ARCH} == "mips" && ${TARGET} == "mips" +.if defined(TARGET_ARCH) && defined(TARGET) && ${TARGET_ARCH} == "mips" && \ + ${TARGET} == "mips" .warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb" .if defined(TARGET_BIG_ENDIAN) TARGET_ARCH=mipseb @@ -133,7 +134,8 @@ .endif .endif # arm with TARGET_BIG_ENDIAN -> armeb -.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && \ + defined(TARGET_BIG_ENDIAN) .warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated. use armeb" TARGET_ARCH=armeb .endif Thanks! -Garrett