CC'd smh, who committed an update recently in this file. I have confirmed the failure (but do not understand why I did not see it when testing the patch...). Steven, can you please take a look at this? Glen On Fri, Jan 29, 2016 at 05:42:10PM +0000, John wrote:> Hi, > > I get the following error in /usr/src when trying to upgrade my system. > In part of this process, I usually run make clean in /usr/src then go > on to running buildworld. > > The installed system is 10.3-PRERELEASE #0 r294087 > The sources I'm building from is 295045 > > Working Copy Root Path: /usr/src > URL: https://svn0.eu.freebsd.org/base/stable/10 > Relative URL: ^/stable/10 > Repository Root: https://svn0.eu.freebsd.org/base > Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f > Revision: 295045 > > Here is the error: > > [...lots of output...] > > rm -rf builddir > ===> sys (clean) > ===> sys/boot (clean) > ===> sys/boot/ficl (clean) > rm -f softcore.c testmain testmain.o > rm -f a.out dict.o ficl.o fileaccess.o float.o loader.o math64.o > prefix.o search.o stack.o tools.o vm.o words.o sysdep.o softcore.o > dict.o.tmp ficl.o.tmp fileaccess.o.tmp float.o.tmp loader.o.tmp > math64.o.tmp prefix.o.tmp search.o.tmp stack.o.tmp tools.o.tmp > vm.o.tmp words.o.tmp sysdep.o.tmp softcore.o.tmp rm -f libficl.a > ===> sys/boot/forth (clean) > rm -f beastie.4th.8.gz brand.4th.8.gz check-password.4th.8.gz > color.4th.8.gz delay.4th.8.gz loader.conf.5.gz loader.4th.8.gz > menu.4th.8.gz menusets.4th.8.gz version.4th.8.gz beastie.4th.8.cat.gz > brand.4th.8.cat.gz check-password.4th.8.cat.gz color.4th.8.cat.gz > delay.4th.8.cat.gz loader.conf.5.cat.gz loader.4th.8.cat.gz > menu.4th.8.cat.gz menusets.4th.8.cat.gz version.4th.8.cat.gz > ===> sys/boot/efi (clean) > make[4]: "/usr/src/sys/boot/efi/Makefile" line 4: Malformed > conditional (${COMPILER_TYPE} != "gcc") > make[4]: Fatal errors encountered -- cannot continue > make[4]: stopped in /usr/src/sys/boot/efi > *** Error code 1 > > Stop. > make[3]: stopped in /usr/src/sys/boot > *** Error code 1 > > Stop. > make[2]: stopped in /usr/src/sys > *** Error code 1 > > Stop. > make[1]: stopped in /usr/src > *** Error code 1 > > Stop. > make: stopped in /usr/src > > many thanks, > -- > John > > _______________________________________________ > freebsd-stable at freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"-------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20160129/29079d9e/attachment.sig>
Investigating, strangely enough this builds and cleans just fine from buildenv. On 29/01/2016 17:47, Glen Barber wrote:> CC'd smh, who committed an update recently in this file. I have > confirmed the failure (but do not understand why I did not see it when > testing the patch...). > > Steven, can you please take a look at this? > > Glen > > On Fri, Jan 29, 2016 at 05:42:10PM +0000, John wrote: >> Hi, >> >> I get the following error in /usr/src when trying to upgrade my system. >> In part of this process, I usually run make clean in /usr/src then go >> on to running buildworld. >> >> The installed system is 10.3-PRERELEASE #0 r294087 >> The sources I'm building from is 295045 >> >> Working Copy Root Path: /usr/src >> URL: https://svn0.eu.freebsd.org/base/stable/10 >> Relative URL: ^/stable/10 >> Repository Root: https://svn0.eu.freebsd.org/base >> Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f >> Revision: 295045 >> >> Here is the error: >> >> [...lots of output...] >> >> rm -rf builddir >> ===> sys (clean) >> ===> sys/boot (clean) >> ===> sys/boot/ficl (clean) >> rm -f softcore.c testmain testmain.o >> rm -f a.out dict.o ficl.o fileaccess.o float.o loader.o math64.o >> prefix.o search.o stack.o tools.o vm.o words.o sysdep.o softcore.o >> dict.o.tmp ficl.o.tmp fileaccess.o.tmp float.o.tmp loader.o.tmp >> math64.o.tmp prefix.o.tmp search.o.tmp stack.o.tmp tools.o.tmp >> vm.o.tmp words.o.tmp sysdep.o.tmp softcore.o.tmp rm -f libficl.a >> ===> sys/boot/forth (clean) >> rm -f beastie.4th.8.gz brand.4th.8.gz check-password.4th.8.gz >> color.4th.8.gz delay.4th.8.gz loader.conf.5.gz loader.4th.8.gz >> menu.4th.8.gz menusets.4th.8.gz version.4th.8.gz beastie.4th.8.cat.gz >> brand.4th.8.cat.gz check-password.4th.8.cat.gz color.4th.8.cat.gz >> delay.4th.8.cat.gz loader.conf.5.cat.gz loader.4th.8.cat.gz >> menu.4th.8.cat.gz menusets.4th.8.cat.gz version.4th.8.cat.gz >> ===> sys/boot/efi (clean) >> make[4]: "/usr/src/sys/boot/efi/Makefile" line 4: Malformed >> conditional (${COMPILER_TYPE} != "gcc") >> make[4]: Fatal errors encountered -- cannot continue >> make[4]: stopped in /usr/src/sys/boot/efi >> *** Error code 1 >> >> Stop. >> make[3]: stopped in /usr/src/sys/boot >> *** Error code 1 >> >> Stop. >> make[2]: stopped in /usr/src/sys >> *** Error code 1 >> >> Stop. >> make[1]: stopped in /usr/src >> *** Error code 1 >> >> Stop. >> make: stopped in /usr/src >> >> many thanks, >> -- >> John >> >> _______________________________________________ >> freebsd-stable at freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/freebsd-stable >> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
On Fri, Jan 29, 2016 at 05:47:46PM +0000, Glen Barber wrote:> CC'd smh, who committed an update recently in this file. I have > confirmed the failure (but do not understand why I did not see it when > testing the patch...). > > Steven, can you please take a look at this? >John, can you please try the attached patch? Glen -------------- next part -------------- Index: sys/boot/efi/Makefile ==================================================================--- sys/boot/efi/Makefile (revision 295049) +++ sys/boot/efi/Makefile (working copy) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + # In-tree GCC does not support __attribute__((ms_abi)). .if ${COMPILER_TYPE} != "gcc" -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20160129/4ce6ad5c/attachment.sig>