diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-08-05 10:06:05 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-08-05 10:14:18 +0200 |
| commit | 816c4de4d062c89f5b7a68f68f29b2b033f5b136 (patch) | |
| tree | 7aee761b6d803ed5e123061fae7016edcab1c067 /gcc | |
| parent | f01df5e47b2551e0f435a9efa8e0a30142f3d46b (diff) | |
| download | gcc-816c4de4d062c89f5b7a68f68f29b2b033f5b136.zip gcc-816c4de4d062c89f5b7a68f68f29b2b033f5b136.tar.gz gcc-816c4de4d062c89f5b7a68f68f29b2b033f5b136.tar.bz2 | |
Don't override 'LIBS' if '--enable-languages=rust'; use 'CRAB1_LIBS'
Recent commit 6fef4d6ffcab0fec8518adcb05458cba5dbeac25
"gccrs: libgrust: Add format_parser library", added a general override of
'LIBS += -ldl -lpthread' if '--enable-languages=rust'. This is wrong
conceptually, and will make the build fail on systems not providing such
libraries. Instead, 'CRAB1_LIBS', added a while ago in
commit 75299e4fe50aa8d9b3ff529e48db4ed246083e64
"rust: Do not link with libdl and libpthread unconditionally", should be used,
and not generally, but for 'crab1' only.
gcc/rust/
* Make-lang.in (LIBS): Don't override.
(crab1$(exeext):): Use 'CRAB1_LIBS'.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/Make-lang.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in index 24229c0..c3be5f9 100644 --- a/gcc/rust/Make-lang.in +++ b/gcc/rust/Make-lang.in @@ -54,8 +54,6 @@ GCCRS_D_OBJS = \ rust/rustspec.o \ $(END) -LIBS += -ldl -lpthread - gccrs$(exeext): $(GCCRS_D_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(GCCRS_D_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \ @@ -237,7 +235,7 @@ RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev) @$(call LINK_PROGRESS,$(INDEX.rust),start) +$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ - $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) $(BACKENDLIBS) + $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) $(CRAB1_LIBS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) $(BACKENDLIBS) @$(call LINK_PROGRESS,$(INDEX.rust),end) # Build hooks. |