Date: Sun, 23 Jul 2017 02:09:58 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Mark Millard <markmi@dsl-only.net> Cc: Bryan Drewery <bdrewery@FreeBSD.org>, FreeBSD Toolchain <freebsd-toolchain@freebsd.org>, FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: amd64 -r321109 -> -r321371 buildworld update failed (spans clang 5 update); error: too few arguments provided to function-like macro invocation; , METAMODE and -j8 was used Message-ID: <3EF869EB-ADB6-455B-8725-2E42C73B27EB@FreeBSD.org> In-Reply-To: <DDAAB420-5445-4E5B-B706-3917DF6395CD@dsl-only.net> References: <056C30CC-72B8-41A4-AEAA-64B6B96854DB@dsl-only.net> <E1D3387E-1197-4E2D-AD72-F97F898185B7@FreeBSD.org> <DDAAB420-5445-4E5B-B706-3917DF6395CD@dsl-only.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_BD6F501B-F2F1-4E75-87B0-3F70204BFF0C
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=us-ascii
On 23 Jul 2017, at 02:02, Mark Millard <markmi@dsl-only.net> wrote:
>=20
> On 2017-Jul-22, at 4:50 PM, Dimitry Andric <dim@FreeBSD.org> wrote:
>> On 23 Jul 2017, at 01:32, Mark Millard <markmi@dsl-only.net> wrote:
>>>=20
>>> My first attempt to update amd64 to a clang 5 based /usr/src
>>> failed ( -r321109 -> -r321371 ). Listing just the first
>>> error initially:
>>>=20
>>> --- ToolDrivers/llvm-lib/LibDriver.o ---
>>> In file included from =
/usr/src/contrib/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp:35:
>>> =
/usr/obj/amd64_clang/amd64.amd64/usr/src/lib/clang/libllvm/Options.inc:27:=
92: error: too few arguments provided to function-like macro invocation
>>> OPTION(prefix_0, "<input>", INPUT, Input, INVALID, INVALID, nullptr, =
0, 0, nullptr, nullptr)
>>> =
^
>>> /usr/src/contrib/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp:34:9: =
note: macro 'OPTION' defined here
>>> #define OPTION(_1, _2, ID, _4, _5, _6, _7, _8, _9, _10, _11, _12) =
OPT_##ID,
>>> ^
>>=20
>> Yeah, I think this can happen with an incremental build, and if you
>> enable MK_CLANG_EXTRAS. There was only one Options.inc file first, =
in
>> $WORLDTMP/usr/src/lib/clang/libllvm, but now there are two different
>> ones, under $WORLDTMP/usr/src/lib/clang/libllvm/llvm-lib and
>> $WORLDTMP/usr/src/lib/clang/libllvm/llvm-dlltool. This is a rather
>> unfortunate change from upstream.
>>=20
>> I'm unsure what to do here, maybe it is a good idea to explicitly rm
>> the incorrect file before make starts to search the directory. =
Bryan,
>> any clues? IIRC there were some other precedents where stale objects
>> could get in the way, and would have to be force-deleted before even
>> the depend stage?
>=20
> I've done:
>=20
> # mv /usr/obj/amd64_clang /usr/obj/amd64_clang_r321109_r321371
>=20
> before starting a rebuild --in to preserve my
> failed-build context in case that record of
> the result of the attempt can help.
What you could try with the old objdir is:
rm =
/usr/obj/amd64_clang/amd64.amd64/usr/src/lib/clang/libllvm/Options.inc
then doing another incremental build. I think that will work.
-Dimitry
--Apple-Mail=_BD6F501B-F2F1-4E75-87B0-3F70204BFF0C
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=signature.asc
Content-Type: application/pgp-signature;
name=signature.asc
Content-Description: Message signed with OpenPGP
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.1
iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCWXPpVgAKCRCwXqMKLiCW
o3EyAJwPxn7fNzTVA8antRvqRQhBaI64+ACg9toU864msrbeiZocHlkM8r1cB4Y=
=3rJP
-----END PGP SIGNATURE-----
--Apple-Mail=_BD6F501B-F2F1-4E75-87B0-3F70204BFF0C--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3EF869EB-ADB6-455B-8725-2E42C73B27EB>