From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id F35E43945E0C; Thu, 8 Dec 2022 07:59:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F35E43945E0C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670486392; bh=a5AA3O5R334gBy85U6Nuo7suq/RKH7dvAp4Y95xHg4Y=; h=From:To:Subject:Date:From; b=ASiarKAWfmhzBnay31o4Bdd/cEbI3cZkm18t0qtG8YcfnHHzgL18kjazyaqmdBdAi vDaHrIMO3BJy7xRM0ekm/ExZ/8ChfOtzz9cE88jJgY9I9sOY52PUjnNrpIIyiKBvyp kGi8nQadQzBXpfX4906We8z1foSfk49AVLVOL+5E= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] rename variable which holds bootstrap flag X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: ef9788471008be413a9c545a9500f6287af32ad1 X-Git-Newrev: 9b6cd2601d69bade02b150d24567596dc3e2d2c7 Message-Id: <20221208075952.F35E43945E0C@sourceware.org> Date: Thu, 8 Dec 2022 07:59:52 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9b6cd2601d69bade02b150d24567596dc3e2d2c7 commit 9b6cd2601d69bade02b150d24567596dc3e2d2c7 Author: Arthur Cohen Date: Wed Nov 30 09:27:23 2022 +0100 rename variable which holds bootstrap flag Diff: --- gcc/rust/Make-lang.in | 8 ++++---- gcc/rust/rust-session-manager.cc | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in index c9a8d23e32f..f2234e3c6c1 100644 --- a/gcc/rust/Make-lang.in +++ b/gcc/rust/Make-lang.in @@ -51,9 +51,9 @@ GCCRS_D_OBJS = \ RUST_CXXFLAGS = $(CXXFLAGS) -# If the file exists, we're bootstrapping +# If the file exists, we're bootstrapping. Set a specific flag for the session manager. ifneq ($(wildcard ../stage_current)),) -RUST_CXXFLAGS += -DRUST_RELEASE +SESSION_FLAGS = -DRUST_BOOTSTRAP_BUILD endif gccrs$(exeext): $(GCCRS_D_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) @@ -173,7 +173,7 @@ rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o # The compiler itself is called rust1 (formerly grs1) rust1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBDEPS) - +$(LLINKER) $(RUST_CXXFLAGS) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ + +$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) $(BACKENDLIBS) # Build hooks. @@ -336,7 +336,7 @@ RUST_INCLUDES = -I $(srcdir)/rust \ CFLAGS-rust/rust-lang.o += $(RUST_INCLUDES) CFLAGS-rust/rust-lex.o += $(RUST_INCLUDES) CFLAGS-rust/rust-parse.o += $(RUST_INCLUDES) -CFLAGS-rust/rust-session-manager.o += $(RUST_INCLUDES) $(RUST_CXXFLAGS) +CFLAGS-rust/rust-session-manager.o += $(RUST_INCLUDES) $(SESSION_FLAGS) # build all rust/lex files in rust folder, add cross-folder includes rust/%.o: rust/lex/%.cc diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index d9e4ce06fe7..78dc3a01ccb 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -427,7 +427,8 @@ Session::handle_crate_name (const AST::Crate &parsed_crate) void Session::compile_crate (const char *filename) { -#ifdef RUST_RELEASE +#ifdef RUST_BOOTSTRAP_BUILD + // Do not emit the fatal error or require the flag for dev builds if (!flag_rust_experimental) rust_fatal_error ( Location (), "%s",