@@ -156,7 +156,7 @@ define DEF_OSX_PKG
156
156
$$(eval $$(call DEF_PREPARE,osx-$(1 ) ) )
157
157
158
158
dist-prepare-osx-$(1 ) : PREPARE_HOST=$(1 )
159
- dist-prepare-osx-$(1 ) : PREPARE_TARGETS=$(1 )
159
+ dist-prepare-osx-$(1 ) : PREPARE_TARGETS=$(2 )
160
160
dist-prepare-osx-$(1 ) : PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1 )
161
161
dist-prepare-osx-$(1 ) : PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD )
162
162
dist-prepare-osx-$(1 ) : PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD )
@@ -187,7 +187,11 @@ tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/%
187
187
188
188
endef
189
189
190
- $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
190
+ ifneq ($(CFG_ENABLE_DIST_HOST_ONLY ) ,)
191
+ $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host))))
192
+ else
193
+ $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET))))
194
+ endif
191
195
192
196
dist-osx : $(foreach host,$(CFG_HOST ) ,dist/$(PKG_NAME ) -$(host ) .pkg)
193
197
@@ -205,17 +209,19 @@ distcheck-osx: dist-osx
205
209
# Unix binary installer tarballs
206
210
# #####################################################################
207
211
208
- define DEF_PREPARE_DIST_DIR
209
-
210
- dist-install-dir-$(1 )$(3 ) : PREPARE_HOST=$(1 )
211
- dist-install-dir-$(1 )$(3 ) : PREPARE_TARGETS=$(2 )
212
- dist-install-dir-$(1 )$(3 ) : PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME ) -$(1 )
213
- dist-install-dir-$(1 )$(3 ) : PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD )
214
- dist-install-dir-$(1 )$(3 ) : PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD )
215
- dist-install-dir-$(1 )$(3 ) : PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD )
216
- dist-install-dir-$(1 )$(3 ) : PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD )
217
- dist-install-dir-$(1 )$(3 ) : PREPARE_CLEAN=true
218
- dist-install-dir-$(1 )$(3 ) : prepare-base-dir-$(1 ) docs compiler-docs
212
+ define DEF_INSTALLER
213
+
214
+ $$(eval $$(call DEF_PREPARE,dir-$(1 ) ) )
215
+
216
+ dist-install-dir-$(1 ) : PREPARE_HOST=$(1 )
217
+ dist-install-dir-$(1 ) : PREPARE_TARGETS=$(2 )
218
+ dist-install-dir-$(1 ) : PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME ) -$(1 )
219
+ dist-install-dir-$(1 ) : PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD )
220
+ dist-install-dir-$(1 ) : PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD )
221
+ dist-install-dir-$(1 ) : PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD )
222
+ dist-install-dir-$(1 ) : PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD )
223
+ dist-install-dir-$(1 ) : PREPARE_CLEAN=true
224
+ dist-install-dir-$(1 ) : prepare-base-dir-$(1 ) docs compiler-docs
219
225
$$(Q ) (cd $$(PREPARE_DEST_DIR ) / && find . -type f | sed 's/^\.\///') \
220
226
> tmp/dist/manifest-$(1 ) .in
221
227
$$(Q ) mv tmp/dist/manifest-$(1 ) .in $$(PREPARE_DEST_DIR ) /$$(CFG_LIBDIR_RELATIVE ) /rustlib/manifest.in
@@ -227,24 +233,19 @@ dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
227
233
$$(Q ) cp -r doc $$(PREPARE_DEST_DIR )
228
234
$$(Q )$$(PREPARE_BIN_CMD ) $$(S ) src/etc/install.sh $$(PREPARE_DEST_DIR )
229
235
230
- endef
231
-
232
- define DEF_INSTALLER
233
-
234
- $$(eval $$(call DEF_PREPARE,dir-$(1 ) ) )
235
-
236
- $$(eval $$(call DEF_PREPARE_DIST_DIR,$(1 ) ,$(1 ) ,) )
237
-
238
- $$(eval $$(call DEF_PREPARE_DIST_DIR,$(1 ) ,$(CFG_TARGET ) ,-with-target-libs) )
239
-
240
236
dist/$$(PKG_NAME ) -$(1 ) .tar.gz: dist-install-dir-$(1 )
241
237
@$(call E, build: $$@ )
242
238
$$(Q ) tar -czf dist/$$(PKG_NAME ) -$(1 ) .tar.gz -C tmp/dist $$(PKG_NAME ) -$(1 )
243
239
244
240
endef
245
241
242
+ ifneq ($(CFG_ENABLE_DIST_HOST_ONLY ) ,)
243
+ $(foreach host,$(CFG_HOST),\
244
+ $(eval $(call DEF_INSTALLER,$(host),$(host))))
245
+ else
246
246
$(foreach host,$(CFG_HOST),\
247
- $(eval $(call DEF_INSTALLER,$(host))))
247
+ $(eval $(call DEF_INSTALLER,$(host),$(CFG_TARGET))))
248
+ endif
248
249
249
250
dist-install-dirs : $(foreach host,$(CFG_HOST ) ,dist-install-dir-$(host ) )
250
251
0 commit comments