Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move 'libformat_parser' build into the GCC build directory, and into libgrust #2947

Merged
merged 9 commits into from
Apr 16, 2024
Merged

Move 'libformat_parser' build into the GCC build directory, and into libgrust #2947

merged 9 commits into from
Apr 16, 2024

Commits on Apr 11, 2024

  1. Remove 'libgrust/librustc_format_parser' from 'gcc/rust/Make-lang.in:… 

    …RUST_LDFLAGS'

That directory doesn't even exist.

	gcc/rust/
	* Make-lang.in (RUST_LDFLAGS): Remove
	'libgrust/librustc_format_parser'.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f8ac13a View commit details
    Browse the repository at this point in the history

  2. Remove 'libgrust/libproc_macro_internal' from 'gcc/rust/Make-lang.in:… 

    …RUST_LDFLAGS'

This isn't necessary, as the full path to 'libproc_macro_internal.a' is
specified.

	gcc/rust/
	* Make-lang.in (RUST_LDFLAGS): Remove
	'libgrust/libproc_macro_internal'.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1861f6b View commit details
    Browse the repository at this point in the history

  3. Inline 'gcc/rust/Make-lang.in:RUST_LDFLAGS' 

    Unused.

	gcc/rust/
	* Make-lang.in (RUST_LDFLAGS): Inline into all users.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    326179e View commit details
    Browse the repository at this point in the history

  4. Add 'gcc/rust/Make-lang.in:LIBPROC_MACRO_INTERNAL' 

    ... to avoid verbatim repetition.

	gcc/rust/
	* Make-lang.in (LIBPROC_MACRO_INTERNAL): New.
	(RUST_LIBDEPS, crab1$(exeext)): Use it.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    325f1e8 View commit details
    Browse the repository at this point in the history

  5. Add 'gcc/rust/Make-lang.in:LIBFORMAT_PARSER' 

    ... to avoid verbatim repetition.

	gcc/rust/
	* Make-lang.in (LIBPROC_MACRO_INTERNAL): New.
	(RUST_LIBDEPS, crab1$(exeext), rust/libformat_parser.a): Use it.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3224811 View commit details
    Browse the repository at this point in the history

  6. Inline 'gcc/rust/Make-lang.in:RUST_LIBDEPS' 

    	gcc/rust/
	* Make-lang.in (RUST_LIBDEPS): Inline into all users.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    d8c5246 View commit details
    Browse the repository at this point in the history

  7. Rust: Don't cache 'libformat_parser.a' 

    	gcc/rust/
	* Make-lang.in (LIBFORMAT_PARSER): Point to the actual build artifact.
	($(LIBFORMAT_PARSER)): Don't cache it.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    eb13962 View commit details
    Browse the repository at this point in the history

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

    Fixes #2883.

	* .gitignore: Remove 'libgrust/*/target/'.
	gcc/rust/
	* Make-lang.in (LIBFORMAT_PARSER): Point to the GCC build
	directory.
	* ($(LIBFORMAT_PARSER)): Build in the GCC build directory.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    81ce0df View commit details
    Browse the repository at this point in the history

  9. Rust: Move 'libformat_parser' build into libgrust 

    Addresses #2883.

	contrib/
	* gcc_update (files_and_dependencies): Update for
	'libformat_parser' in libgrust.
	gcc/rust/
	* Make-lang.in (LIBFORMAT_PARSER): Point to 'libformat_parser'
	build in libgrust.
	(%.toml:, $(LIBFORMAT_PARSER):): Remove.
	libgrust/
	* libformat_parser/Makefile.am: New.
	* Makefile.am [!TARGET_LIBRARY] (SUBDIRS): Add 'libformat_parser'.
	* configure.ac: Handle it.
	(TARGET_LIBRARY): New 'AM_CONDITIONAL'.
	* libformat_parser/Makefile.in: Generate.
	* Makefile.in: Regenerate.
	* configure: Likewise.
    @tschwinge
    tschwinge committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    0dbe335 View commit details
    Browse the repository at this point in the history