Skip to content

Commit

Permalink
Take advantage of recent cargo -Cmetadata= fix :D.
Browse files Browse the repository at this point in the history
  • Loading branch information
saurik committed Nov 10, 2024
1 parent d124239 commit f8e0238
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
6 changes: 1 addition & 5 deletions env/output.mk
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ $(output)/%/build.ninja: $$(specific) $$(folder)/meson.build $(output)/$$(arch)/

rust := PATH=$${PATH}:~/.cargo/bin

rustc := 1.77.0
rustc := 1.82.0

$(output)/rustup-install-%:
$(rust) rustup install $*
Expand All @@ -157,10 +157,6 @@ $(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-$(rustc)-$$(triple/$$(arch)) $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config
$(specific)
@mkdir -p $(dir $@)
Expand Down
26 changes: 0 additions & 26 deletions env/rustc-wrapper

This file was deleted.

0 comments on commit f8e0238

Please sign in to comment.