Some changes to allow building rustc

LightningCreations · Nov 5, 2021 · cb9bcd1 · cb9bcd1
1 parent 0b48535
commit cb9bcd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/build-1.54.0.sh b/build-1.54.0.sh
@@ -5,6 +5,6 @@ RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make RUSTCSRC
 RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make -f minicargo.mk LIBS
 RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make test
 RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make local_tests
-#RUSTC_INSTALL_BINDIR=bin RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make -f minicargo.mk output-1.54.0/rustc
-#LIBGIT2_SYS_USE_PKG_CONFIG=1 RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make -f minicargo.mk output-1.54.0/cargo
-#./output-1.54.0/cargo --version
+RUSTC_INSTALL_BINDIR=bin RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make -f minicargo.mk output-1.54.0/rustc
+LIBGIT2_SYS_USE_PKG_CONFIG=1 RUSTC_VERSION=1.54.0 MRUSTC_TARGET_VER=1.54 OUTDIR_SUF=-1.54.0 make -f minicargo.mk output-1.54.0/cargo
+./output-1.54.0/cargo --version
diff --git a/minicargo.mk b/minicargo.mk
@@ -54,8 +54,10 @@ else
 endif
 ifeq ($(RUSTC_VERSION),1.54.0)
   RUST_LIB_PREFIX := library/
+  RUSTC_SRC_PREFIX := compiler/rustc/
 else
   RUST_LIB_PREFIX := src/lib
+  RUSTC_SRC_PREFIX := src/rustc
 endif
 
 LLVM_CONFIG := $(RUSTCSRC)build/bin/llvm-config
@@ -130,7 +132,7 @@ RUSTC_ENV_VARS += RUSTC_INSTALL_BINDIR=bin
 
 $(OUTDIR)rustc: $(MRUSTC) $(MINICARGO) LIBS $(LLVM_CONFIG)
 	mkdir -p $(OUTDIR)rustc-build
-	$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)src/rustc --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS)
+	$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)$(RUSTC_SRC_PREFIX) --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS)
 	test ! $(OUTDIR)rustc-build/$(RUSTC_OUT_BIN) -nt $@ || cp $(OUTDIR)rustc-build/$(RUSTC_OUT_BIN) $@
 $(OUTDIR)rustc-build/librustc_driver.rlib: $(MRUSTC) $(MINICARGO) LIBS
 	mkdir -p $(OUTDIR)rustc-build

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-1.29.0
+1.54.0