Skip to content

Commit 59af289

Browse files
committed
---
yaml --- r: 105119 b: refs/heads/snap-stage3 c: b8138e0 h: refs/heads/master i: 105117: afeb3e5 105115: a2fb0ba 105111: c09aabd 105103: 857e100 105087: bec1e39 v: v3
1 parent 3e37abb commit 59af289

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: dd7a60e0c3090488041788256f211e2d02636b73
4+
refs/heads/snap-stage3: b8138e0cf274a0575240ea02e5349505eafacae6
55
refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/dist.mk

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,15 @@ $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
165165

166166
dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
167167

168+
else
169+
170+
dist-osx:
171+
168172
endif
169173

174+
# FIXME should do something
175+
distcheck-osx:
176+
170177

171178
######################################################################
172179
# Unix binary installer tarballs
@@ -223,6 +230,7 @@ distcheck-tar-bins: dist-tar-bins
223230
# Just copy the docs to a folder under dist with the appropriate name
224231
# for uploading to S3
225232
dist-docs: docs compiler-docs
233+
$(Q) rm -Rf dist/doc
226234
$(Q) mkdir -p dist/doc/
227235
$(Q) cp -r doc dist/doc/$(CFG_PACKAGE_VERS)
228236

@@ -239,18 +247,18 @@ distcheck: dist
239247
$(Q)rm -Rf tmp/distcheck
240248
@echo
241249
@echo -----------------------------------------------
242-
@echo Rust ready for distribution (see ./dist)
250+
@echo "Rust ready for distribution (see ./dist)"
243251
@echo -----------------------------------------------
244252

245253
else
246254

247-
dist: dist-tar-src
255+
dist: dist-tar-src dist-osx dist-tar-bins dist-docs
248256

249-
distcheck: dist distcheck-tar-src
257+
distcheck: dist distcheck-tar-src distcheck-osx distcheck-tar-bins
250258
$(Q)rm -Rf tmp/distcheck
251259
@echo
252260
@echo -----------------------------------------------
253-
@echo Rust ready for distribution (see ./dist)
261+
@echo "Rust ready for distribution (see ./dist)"
254262
@echo -----------------------------------------------
255263

256264
endif

0 commit comments

Comments
 (0)