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

[Steven Hartland]

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 <bsd.subdir.mk>
>
>
>