Hi! On 2024-08-01T16:56:02+0200, Arthur Cohen <arthur.co...@embecosm.com> wrote: > --- a/gcc/rust/Make-lang.in > +++ b/gcc/rust/Make-lang.in > @@ -212,6 +212,9 @@ RUST_ALL_OBJS = $(GRS_OBJS) $(RUST_TARGET_OBJS) > rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o > > LIBPROC_MACRO_INTERNAL = > ../libgrust/libproc_macro_internal/libproc_macro_internal.a > +LIBFORMAT_PARSER = rust/libformat_parser.a > + > +RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) > > > RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL)
That must've been a mis-merge; my GCC/Rust master branch original of this commit (as part of <https://github.com/Rust-GCC/gccrs/pull/2947> "Move 'libformat_parser' build into the GCC build directory, and into libgrust") didn't include a bogus second definition of 'RUST_LIBDEPS'. I've pushed to trunk branch commit aab9f33ed1f1b92444a82eb3ea5cab1048593791 "Inline 'gcc/rust/Make-lang.in:RUST_LIBDEPS'", see attached -- this commit apparently had been omitted from the 2024-08-01 upstream submission. Grüße Thomas
>From aab9f33ed1f1b92444a82eb3ea5cab1048593791 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tschwi...@baylibre.com> Date: Wed, 28 Feb 2024 23:06:25 +0100 Subject: [PATCH] Inline 'gcc/rust/Make-lang.in:RUST_LIBDEPS' ..., also fixing up an apparently mis-merged commit 2340894554334a310b891a1d9e9d5e3f502357ac "gccrs: Add 'gcc/rust/Make-lang.in:LIBFORMAT_PARSER'", which was adding a bogus second definition of 'RUST_LIBDEPS'. gcc/rust/ * Make-lang.in (RUST_LIBDEPS): Inline into all users. --- gcc/rust/Make-lang.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in index c3be5f9d81b..aed9a998c80 100644 --- a/gcc/rust/Make-lang.in +++ b/gcc/rust/Make-lang.in @@ -226,13 +226,8 @@ rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o LIBPROC_MACRO_INTERNAL = ../libgrust/libproc_macro_internal/libproc_macro_internal.a LIBFORMAT_PARSER = ../libgrust/libformat_parser/debug/liblibformat_parser.a -RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) - - -RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) - # The compiler itself is called crab1 -crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev) +crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) $(rust.prev) @$(call LINK_PROGRESS,$(INDEX.rust),start) +$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) $(CRAB1_LIBS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) $(BACKENDLIBS) -- 2.34.1
