Skip to content

Commit 22a04ce

Browse files
committed
auto merge of #13174 : brson/rust/dist, r=alexcrichton,huonw
2 parents 7e987c3 + 476f0e3 commit 22a04ce

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

mk/install.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
install: dist-install-dir-$(CFG_BUILD)
1313
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"
1414
# Remove tmp files while we can because they may have been created under sudo
15-
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD/
15+
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
1616

1717
uninstall: dist-install-dir-$(CFG_BUILD)
1818
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"

mk/rt.mk

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ $$(LIBUV_DIR_$(1))/Release/libuv.a: $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) \
215215
BUILDTYPE=Release \
216216
NO_LOAD="$$(LIBUV_NO_LOAD)" \
217217
V=$$(VERBOSE)
218+
$$(Q)touch $$@
218219

219220
endif
220221

0 commit comments

Comments
 (0)