From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 2EDE33945E28; Thu, 8 Dec 2022 08:00:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2EDE33945E28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670486403; bh=6sjxEeIfAgcScEK40WXJdDJ6bR3cG/gnF6xurrqESiA=; h=From:To:Subject:Date:From; b=tuOBjHhclU+lOKv/PCOdNs2vj/PUXq7zkDowaW1OU4FiFD2Wde7VSu5Fl6E3j//Jj E++omIDqWQH4kMjzla25vWDbMYXTlQvpWFoZyQ26eZv+9rgNlZpkZ0LPcffA+wyG+j JTY/QaD+fdiFN1kp+M11ECloR38D9V+p1qsoC9lU= 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] long_flag: Add env variable, remove bootstrap guards X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 3df7703a627ed3a070c91cf2e3b92ec993684531 X-Git-Newrev: b2d445c2bbb15e6a1f1d0e5ac693fd671ecaa473 Message-Id: <20221208080003.2EDE33945E28@sourceware.org> Date: Thu, 8 Dec 2022 08:00:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b2d445c2bbb15e6a1f1d0e5ac693fd671ecaa473 commit b2d445c2bbb15e6a1f1d0e5ac693fd671ecaa473 Author: Arthur Cohen Date: Fri Dec 2 10:19:39 2022 +0100 long_flag: Add env variable, remove bootstrap guards Diff: --- gcc/rust/Make-lang.in | 11 +++-------- gcc/rust/rust-session-manager.cc | 10 +++++----- gcc/testsuite/lib/rust.exp | 2 ++ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in index 656c46dba7e..21d7d4eef71 100644 --- a/gcc/rust/Make-lang.in +++ b/gcc/rust/Make-lang.in @@ -49,13 +49,6 @@ GCCRS_D_OBJS = \ rust/rustspec.o \ $(END) -RUST_CXXFLAGS = $(CXXFLAGS) - -# If the file exists, we're bootstrapping. Set a specific flag for the session manager. -ifneq ($(wildcard ../stage_current),) -SESSION_FLAGS = -DRUST_BOOTSTRAP_BUILD -endif - 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 \ @@ -336,7 +329,9 @@ 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) $(SESSION_FLAGS) +CFLAGS-rust/rust-session-manager.o += $(RUST_INCLUDES) + +RUST_CXXFLAGS = $(CXXFLAGS) # 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 78dc3a01ccb..54660a85322 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -427,9 +427,8 @@ Session::handle_crate_name (const AST::Crate &parsed_crate) void Session::compile_crate (const char *filename) { -#ifdef RUST_BOOTSTRAP_BUILD - // Do not emit the fatal error or require the flag for dev builds - if (!flag_rust_experimental) + if (!flag_rust_experimental + && !std::getenv ("GCCRS_INCOMPLETE_AND_EXPERIMENTAL_COMPILER_DO_NOT_USE")) rust_fatal_error ( Location (), "%s", "gccrs is not yet able to compile Rust code " @@ -443,11 +442,12 @@ Session::compile_crate (const char *filename) "If you understand this, and understand that the binaries produced might " "not behave accordingly, you may attempt to use gccrs in an experimental " "manner by passing the following flag:\n\n" - "`-frust-incomplete-and-experimental-compiler-do-not-use`\n\nFor " + "`-frust-incomplete-and-experimental-compiler-do-not-use`\n\nor by " + "defining the following environment variable (any value will " + "do)\n\nGCCRS_INCOMPLETE_AND_EXPERIMENTAL_COMPILER_DO_NOT_USE\n\nFor" "cargo-gccrs, this means passing\n\n" "GCCRS_EXTRA_FLAGS=\"-frust-incomplete-and-experimental-compiler-do-not-" "use\"\n\nas an environment variable."); -#endif RAIIFile file_wrap (filename); if (!file_wrap.ok ()) diff --git a/gcc/testsuite/lib/rust.exp b/gcc/testsuite/lib/rust.exp index 6993c976304..287905bd544 100644 --- a/gcc/testsuite/lib/rust.exp +++ b/gcc/testsuite/lib/rust.exp @@ -149,6 +149,8 @@ proc rust_init { args } { lappend ALWAYS_RUSTFLAGS "additional_flags=$TOOL_OPTIONS" } + lappend ALWAYS_RUSTFLAGS "additional_flags=-frust-incomplete-and-experimental-compiler-do-not-use" + verbose -log "ALWAYS_RUSTFLAGS set to $ALWAYS_RUSTFLAGS" set gcc_warning_prefix "warning:"