TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Move 'libformat_parser' build into the GCC build directory

Browse Source 
Fixes #2883.

gcc/rust/ChangeLog:
	* Make-lang.in (LIBFORMAT_PARSER): Point to the GCC build
	directory.
	* ($(LIBFORMAT_PARSER)): Build in the GCC build directory.
This commit is contained in:
Thomas Schwinge
2024-02-28 23:26:39 +01:00
committed by Arthur Cohen
parent 96a5c5bd28
commit acf10f83ab
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/rust/Make-lang.in
View File

@@ -212,7 +212,8 @@ 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 = $(srcdir)/../libgrust/libformat_parser/target/debug/liblibformat_parser.a
LIBFORMAT_PARSER_D = rust/libformat_parser
LIBFORMAT_PARSER = $(LIBFORMAT_PARSER_D)/debug/liblibformat_parser.a
RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER)
@@ -416,7 +417,13 @@ rust/%.o: rust/lex/%.cc
# TODO: Improve `cargo` invocation with host specific flags, possibly creating a $(CARGO) variable?
$(LIBFORMAT_PARSER): $(srcdir)/../libgrust/libformat_parser/Cargo.toml $(wildcard $(srcdir)/../libgrust/libformat_parser/src/*.rs)
cd $(srcdir)/../libgrust/libformat_parser && cargo build --offline # FIXME: Not always release, right?
cargo \
--config $(srcdir)/../libgrust/libformat_parser/.cargo/config \
build \
--offline \
--target-dir $(LIBFORMAT_PARSER_D) \
--manifest-path $(srcdir)/../libgrust/libformat_parser/Cargo.toml \
# FIXME: Not always '--release', right?
# build all rust/parse files in rust folder, add cross-folder includes
rust/%.o: rust/parse/%.cc