From owner-svn-src-stable@freebsd.org Sat Jan 30 01:33:08 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B4B1A73A43 for ; Sat, 30 Jan 2016 01:33:08 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8EB1CAA8 for ; Sat, 30 Jan 2016 01:33:07 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: by mail-wm0-x232.google.com with SMTP id l66so3907993wml.0 for ; Fri, 29 Jan 2016 17:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-type:content-transfer-encoding; bh=J8Z0FGFzoIoSSNH1cviNI0bRK8l4HTdz1bnXAP7K4eY=; b=DtAO8oYiUD8PEv/HmTvKAqMYDbl7cXpWLif5M493lcMaRVxuk+gDSSdw8Lhh3p4NlO f21hAH8nU1dAHCFHJAjCLI5KdNRDmTaMtQJoA4dazxaIURqufZo2+NuNyw9CD0dh9E2w NNTLdfA1wqcyPFe+CbdGucoSM2Lr9eR8J7ZWnG1jOvddzaqZBKaTSMBFNJvZmRkNCx99 VS5rv+DTMy68Iml51HylTCS+k9viTaB4cZK9AxIwe4PMX65eIE6ipCZxVts1o3jMYTgO aaIzHbRZgLBB1vxI+GHg8LTo6qI945v1ik3veBqNOAMcyPgtB/NBZmHQq+3dEfh26wFU Uy3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=J8Z0FGFzoIoSSNH1cviNI0bRK8l4HTdz1bnXAP7K4eY=; b=ILXcfpHzeNtbussSeXPD7OeosqN3OKoilIfAbn+hHbt2rX5ijN9iILz3JyNk/jz2RT 1cC4g2uOqvhCs576Vk7OSoASFENrmAfENGL7iyCGFB5vXc+jozNqZY2GlJd5mpN4VdTi RtpiuPnVPzovxjKYjRS12YiFEpsqcLocrnKwRnP0hQg/Hn5wZyTWta50mKS/cTU5/cLJ AFnv9zhMaUMdaay1ZYnHVz7MhNqgHm3AyDDjN+ciNk1+hwt4H6stg7whNIF79hLR9o3E nlCPf9ukxU2h+64yySRK9LS12AwPQKdfS9m9/TX/3Z3R4psODXssMFxScxtiwKHcAHjb aWiQ== X-Gm-Message-State: AG10YOQw7/bpw4hIVIgERqQr5n1pK/Pe8W85d73SC9d2aeZqx3cUjIKYeFRpRC/py29JU3aC X-Received: by 10.28.146.145 with SMTP id u139mr338231wmd.81.1454117586008; Fri, 29 Jan 2016 17:33:06 -0800 (PST) Received: from [10.10.1.58] (liv3d.labs.multiplay.co.uk. [82.69.141.171]) by smtp.gmail.com with ESMTPSA id qs1sm17950502wjc.2.2016.01.29.17.33.04 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Jan 2016 17:33:04 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Subject: Re: svn commit: r294981 - in stable/10/sys/boot: common efi efi/boot1 efi/include efi/libefi efi/loader efi/loader/arch/amd64 fdt i386/libi386 To: Andrey Chernov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org References: <201601281211.u0SCBhQG058154@repo.freebsd.org> <56ABF762.7010103@freebsd.org> <56ABFA28.1000207@freebsd.org> Message-ID: <56AC12E2.6010001@freebsd.org> Date: Sat, 30 Jan 2016 01:33:22 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <56ABFA28.1000207@freebsd.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2016 01:33:08 -0000 Just spotted the reply from re@ which came in a hour or so ago (thanks glebius) so this is fixed as of r295057 On 29/01/2016 23:47, Andrey Chernov wrote: > On 30.01.2016 2:36, Andrey Chernov wrote: >> I am not sure this is exact commit which cause this, but any operation >> in /sys/boot/efi ends like this (by hand, not from buildworld): >> (i386-stable machine, clang compiler) >> >> ===> efi (obj) >> make[1]: "/usr/src/sys/boot/efi/Makefile" line 4: Malformed conditional >> (${COMPILER_TYPE} != "gcc") >> make[1]: Fatal errors encountered -- cannot continue >> make[1]: stopped in /usr/src/sys/boot/efi >> *** Error code 1 >> >> Stop. >> make: stopped in /usr/src/sys/boot >> > As Makefile shows, there is no include to pick COMPILER_TYPE and it is > undefined. You need at least to move bsd.subdir.mk up. > > # $FreeBSD: stable/10/sys/boot/efi/Makefile 294981 2016-01-28 12:11:42Z > smh $ > > # In-tree GCC does not support __attribute__((ms_abi)). > .if ${COMPILER_TYPE} != "gcc" > > .if ${MACHINE_CPUARCH} == "amd64" > SUBDIR+= libefi loader boot1 > .endif > > .endif # ${COMPILER_TYPE} != "gcc" > > .include > > >