diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-07-23 12:04:13 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-07-23 12:04:29 -0700 |
| commit | e34e86d151341076556635b9bc233338d3d9898e (patch) | |
| tree | 8a2edff0d888e6847f94987b1461cb7862d44d76 | |
| parent | 04914fddfb772eed2fe83b7638bd04ca23eacc0a (diff) | |
mk: Have the various flavors of 'dist' install all targets by default
Closes #15711
| -rw-r--r-- | mk/dist.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index a3d9a5758e4..99fad94bf76 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -156,7 +156,7 @@ define DEF_OSX_PKG $$(eval $$(call DEF_PREPARE,osx-$(1))) dist-prepare-osx-$(1): PREPARE_HOST=$(1) -dist-prepare-osx-$(1): PREPARE_TARGETS=$(1) +dist-prepare-osx-$(1): PREPARE_TARGETS=$(2) dist-prepare-osx-$(1): PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1) dist-prepare-osx-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) dist-prepare-osx-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) @@ -187,7 +187,11 @@ tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/% endef -$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host)))) +ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),) +$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host)))) +else +$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET)))) +endif dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg) @@ -210,7 +214,7 @@ define DEF_INSTALLER $$(eval $$(call DEF_PREPARE,dir-$(1))) dist-install-dir-$(1): PREPARE_HOST=$(1) -dist-install-dir-$(1): PREPARE_TARGETS=$(1) +dist-install-dir-$(1): PREPARE_TARGETS=$(2) dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1) dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) @@ -235,8 +239,13 @@ dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) endef +ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),) $(foreach host,$(CFG_HOST),\ - $(eval $(call DEF_INSTALLER,$(host)))) + $(eval $(call DEF_INSTALLER,$(host),$(host)))) +else +$(foreach host,$(CFG_HOST),\ + $(eval $(call DEF_INSTALLER,$(host),$(CFG_TARGET)))) +endif dist-install-dirs: $(foreach host,$(CFG_HOST),dist-install-dir-$(host)) |