From a8b3ee5469c403910a8567e1f491c2b810dd786f Mon Sep 17 00:00:00 2001 From: John Hodge Date: Tue, 27 Feb 2024 23:13:47 +0800 Subject: [PATCH] minicargo.mk - 1.74 rustc is being built, only 20% complete --- build-1.74.0.sh | 2 +- minicargo.mk | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build-1.74.0.sh b/build-1.74.0.sh index 7ae5c300..1bb3734d 100755 --- a/build-1.74.0.sh +++ b/build-1.74.0.sh @@ -7,7 +7,7 @@ make -f minicargo.mk LIBS $@ make test $@ make local_tests $@ ## Build just rustc-driver BEFORE building llvm -#RUSTC_INSTALL_BINDIR=bin make -f minicargo.mk output-1.74.0/rustc-build/librustc_driver.rlib +RUSTC_INSTALL_BINDIR=bin make -f minicargo.mk output-1.74.0/rustc-build/librustc_driver.rlib #RUSTC_INSTALL_BINDIR=bin make -f minicargo.mk output-1.74.0/rustc $@ #./output-1.74.0/rustc --version diff --git a/minicargo.mk b/minicargo.mk index 9b94ecad..13317717 100644 --- a/minicargo.mk +++ b/minicargo.mk @@ -127,6 +127,10 @@ ifeq ($(RUSTC_VERSION),1.54.0) SRCDIR_RUSTC := compiler/rustc SRCDIR_RUSTC_DRIVER := compiler/rustc_driver endif +ifeq ($(RUSTC_VERSION),1.74.0) + SRCDIR_RUSTC := compiler/rustc + SRCDIR_RUSTC_DRIVER := compiler/rustc_driver +endif SRCDIR_RUST_TESTS := $(RUSTCSRC)src/test/ ifeq ($(RUSTC_VERSION),1.74.0)