Upgrade to latest Rust (unlocked by NDK r26c ldd).

OrchidTechnologies · Apr 2, 2024 · d8f5cee · d8f5cee
1 parent 176e4bc
commit d8f5cee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/env/output.mk b/env/output.mk
@@ -139,22 +139,21 @@ $(output)/%/build.ninja: $$(specific) $$(folder)/meson.build $(output)/$$(arch)/
 
 rust := PATH=$${PATH}:~/.cargo/bin
 
-# XXX: stuck on rustc 1.69.0 due to https://github.com/rust-lang/rust/issues/112368
-rustc := 1.69.0
+rustc := 1.77.0
 
 $(output)/rustup-install-%:
 	$(rust) rustup install $*
 	@touch $@
 
-$(output)/rustup-target-%: $(output)/rustup-install-$(rustc)
+$(output)/rustup-target-$(rustc)-%: $(output)/rustup-install-$(rustc)
 	$(rust) rustup target add $* --toolchain $(rustc)
 	@touch $@
 
 ifneq ($(uname-o),Cygwin)
 export RUSTC_WRAPPER=$(CURDIR)/env/rustc-wrapper
 endif
 
-$(output)/%/librust.a: $$(specific) $$(folder)/Cargo.toml $(output)/rustup-target-$$(triple/$$(arch)) $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config
+$(output)/%/librust.a: $$(specific) $$(folder)/Cargo.toml $(output)/rustup-target-$(rustc)-$$(triple/$$(arch)) $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config
 	$(specific)
 	@mkdir -p $(dir $@)
 

diff --git a/min-webrtc/target-win.mk b/min-webrtc/target-win.mk
@@ -23,6 +23,7 @@ lflags += -luserenv
 lflags += -lole32
 # XXX: technically for rust
 lflags += -lbcrypt
+lflags += -lntdll
 
 lflags += -lcrypt32
 lflags += -ldbghelp