Skip to content

Commit 451b959

Browse files
committed
mk: Really fix win32 distributions
The macro in question doesn't actually have a $(2) argument so $(1) should really be used as it's the target in question.
1 parent 9a85566 commit 451b959

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

mk/dist.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,21 @@ dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)-host prepare-overlay-$(1)
154154
# to include. THe first argument to `make-win-dist` is where to put these DLLs
155155
# (the image we're creating) and the second argument is a junk directory to
156156
# ignore all the other MinGW stuff the script creates.
157-
ifeq ($(2),i686-pc-windows-gnu)
158-
$$(Q)rm -Rf tmp/dist/win-rust-gcc-$(2)
157+
ifeq ($(1),i686-pc-windows-gnu)
158+
$$(Q)rm -Rf tmp/dist/win-rust-gcc-$(1)
159159
$$(Q)$$(CFG_PYTHON) $$(S)src/etc/make-win-dist.py \
160-
tmp/dist/$$(PKG_NAME)-$(2)-image \
161-
tmp/dist/win-rust-gcc-$(2) $(2)
160+
tmp/dist/$$(PKG_NAME)-$(1)-image \
161+
tmp/dist/win-rust-gcc-$(1) $(1)
162162
endif
163163
# On 32-bit MinGW we're always including a DLL which needs some extra licenses
164164
# to distribute. On 64-bit MinGW we don't actually distribute anything requiring
165165
# us to distribute a license but it's likely that the install will *also*
166166
# include the rust-mingw package down below, which also need licenses, so to be
167167
# safe we just inlude it here in all MinGW packages.
168-
ifdef CFG_WINDOWSY_$(2)
169-
ifeq ($$(findstring $(2),gnu),gnu)
168+
ifdef CFG_WINDOWSY_$(1)
169+
ifeq ($$(findstring $(1),gnu),gnu)
170170
$$(Q)cp -r $$(S)src/etc/third-party \
171-
tmp/dist/$$(PKG_NAME)-$(2)-image/share/doc/
171+
tmp/dist/$$(PKG_NAME)-$(1)-image/share/doc/
172172
endif
173173
endif
174174
$$(Q)$$(S)src/rust-installer/gen-installer.sh \

0 commit comments

Comments
 (0)