Skip to content

Commit cd22f85

Browse files
committed
mk: Wire up everything to dist and distcheck
Fix some misc bugs
1 parent acdb5ff commit cd22f85

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

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)