Final

Signed-off-by: Klimenty Tsoutsman <klim@tsoutsman.com>
theseus-os · Nov 15, 2023 · 55b1f96 · 55b1f96
1 parent e3c5f2b
commit 55b1f96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,4 @@ github_pages/doc/
 
 # TODO: Remove once std is upstreamed
 .cargo/
+/ports/rust
diff --git a/Makefile b/Makefile
@@ -323,12 +323,15 @@ endif
 ## This target invokes the actual Rust build process via `cargo`.
 cargo:
 ifeq ($(std),yes)
-	if [ ! -d $(RUST_SOURCE) ] ; then \
-		git clone https://github.com/theseus-os/rust.git --branch theseus-std-5 $(RUST_SOURCE); \
-		git -c $(RUST_SOURCE) checkout 3167b29; \
-		git -c $(RUST_SOURCE) sumbodule update --init; \
+##  We need enough history to include one upstream commit, so that bootstrap can find a commit hash
+##  for downloading LLVM.
+	@if [ ! -d $(RUST_SOURCE) ] ; then \
+		git clone https://github.com/theseus-os/rust.git --branch theseus-std-5 $(RUST_SOURCE) --depth 50; \
 	fi
 
+	git -C $(RUST_SOURCE) checkout 3167b29
+	git -C $(RUST_SOURCE) submodule update --init --depth 1
+
 ##  Cache std/Cargo.toml
 	cp $(RUST_SOURCE)/library/std/Cargo.toml $(ROOT_DIR)/std-cargo.toml
 ##	Remove the last line of std/Cargo.toml