Skip to content

Commit e424437

Browse files
committed
Try to fix vendoring arm64
1 parent 85945a3 commit e424437

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/Makevars.ucrt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ all: clean rustup
88
$(SHLIB): $(STATLIB)
99

1010
$(STATLIB):
11-
ifeq ($(TARGET),x86_64-pc-windows-gnu)
1211
@echo Building for $(TARGET) from vendor.tar.xz sources!
1312
if [ -f myrustlib/vendor.tar.xz ]; then tar xf myrustlib/vendor.tar.xz && mkdir -p .cargo && cp myrustlib/vendor-config.toml .cargo/config.toml; fi
14-
endif
1513
PATH="$(USERPROFILE)\\.cargo\\bin:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
1614
rm -Rf $(LIBDIR)/build
1715

src/myrustlib/vendor-update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
rm -Rf vendor vendor.tar.xz
33
cargo vendor
4-
rm -Rf vendor/windows_*_gnullvm/lib/* vendor/windows_*_msvc/lib/* vendor/windows_i686*/lib/*
4+
rm -Rf vendor/windows_x86_64_gnullvm/lib/* vendor/windows_*_msvc/lib/* vendor/windows_i686*/lib/*
55
XZ_OPT=-9 tar -cJ --no-xattrs -f vendor.tar.xz vendor
66
rm -Rf vendor

0 commit comments

Comments
 (0)