diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-02-28 23:06:25 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-08-05 10:33:35 +0200 |
| commit | aab9f33ed1f1b92444a82eb3ea5cab1048593791 (patch) | |
| tree | 9a40d755e89e8fdaf3126ceef42ee7366ba46906 /gcc | |
| parent | 816c4de4d062c89f5b7a68f68f29b2b033f5b136 (diff) | |
| download | gcc-aab9f33ed1f1b92444a82eb3ea5cab1048593791.zip gcc-aab9f33ed1f1b92444a82eb3ea5cab1048593791.tar.gz gcc-aab9f33ed1f1b92444a82eb3ea5cab1048593791.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/Make-lang.in | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in index c3be5f9..aed9a99 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) |