svn commit: r335906 - head/sys/conf

[Bryan Drewery]

On 7/3/2018 12:59 PM, Cy Schubert wrote:
> In message <201807031924.w63JOi5W051614 at repo.freebsd.org>, Bryan 
> Drewery writes
> :
>> Author: bdrewery
>> Date: Tue Jul  3 19:24:44 2018
>> New Revision: 335906
>> URL: https://svnweb.freebsd.org/changeset/base/335906
>>
>> Log:
>>   No need to make a copy to build genoffset_test.o
>>
>> Modified:
>>   head/sys/conf/kern.post.mk
>>
>> Modified: head/sys/conf/kern.post.mk
>> =============================================================================
>> =
>> --- head/sys/conf/kern.post.mk	Tue Jul  3 19:09:46 2018	(r33590
>> 5)
>> +++ head/sys/conf/kern.post.mk	Tue Jul  3 19:24:44 2018	(r33590
>> 6)
>> @@ -191,14 +191,12 @@ offset.inc: $S/kern/genoffset.sh genoffset.o
>>  genoffset.o: $S/kern/genoffset.c
>>  	${CC} -c ${CFLAGS:N-flto:N-fno-common} $S/kern/genoffset.c
>>  
>> -genoffset_test.c: $S/kern/genoffset.c
>> -	cp $S/kern/genoffset.c genoffset_test.c
>> -
>>  # genoffset_test.o is not actually used for anything - the point of compilin
>> g it
>>  # is to exercise the CTASSERT that checks that the offsets in the offset.inc
>>  # _lite struct(s) match those in the original(s). 
>> -genoffset_test.o: genoffset_test.c offset.inc
>> -	${CC} -c ${CFLAGS:N-flto:N-fno-common} -DOFFSET_TEST genoffset_test.c
>> +genoffset_test.o: $S/kern/genoffset.c offset.inc
>> +	${CC} -c ${CFLAGS:N-flto:N-fno-common} -DOFFSET_TEST ${.ALLSRC:M*.c} \
>> +	    -o ${.TARGET}
> 
> -o with -c in the previous line will cause an error.

-o and -c are fine together. The problem is .ALLSRC duplicating sources
from the dependencies read from .depend.genoffset_test.o file.
Workaround in r335908.

> 
>>  
>>  assym.inc: $S/kern/genassym.sh genassym.o genoffset_test.o
>>  	NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.
>> TARGET}
>>
> 
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20180703/df3b06c8/attachment.sig>