bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "Made 'make install' include libs for additional targets"

Browse source 
This reverts commit 87334fb05f.

Conflicts:
	mk/install.mk
This commit is contained in:
Brian Anderson 2014-07-22 17:17:57 -07:00
parent bc6bbc3db1
commit ce20571a55
2 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
mk/dist.mk
View file

@ -205,17 +205,19 @@ distcheck-osx: dist-osx
# Unix binary installer tarballs # Unix binary installer tarballs
###################################################################### ######################################################################
define DEF_PREPARE_DIST_DIR define DEF_INSTALLER
dist-install-dir-$(1)$(3): PREPARE_HOST=$(1) $$(eval $$(call DEF_PREPARE,dir-$(1)))
dist-install-dir-$(1)$(3): PREPARE_TARGETS=$(2)
dist-install-dir-$(1)$(3): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1) dist-install-dir-$(1): PREPARE_HOST=$(1)
dist-install-dir-$(1)$(3): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) dist-install-dir-$(1): PREPARE_TARGETS=$(1)
dist-install-dir-$(1)$(3): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
dist-install-dir-$(1)$(3): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
dist-install-dir-$(1)$(3): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
dist-install-dir-$(1)$(3): PREPARE_CLEAN=true dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
dist-install-dir-$(1): PREPARE_CLEAN=true
dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \ $$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \
> tmp/dist/manifest-$(1).in > tmp/dist/manifest-$(1).in
$$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in $$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in
@ -227,16 +229,6 @@ dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
$$(Q)cp -r doc $$(PREPARE_DEST_DIR) $$(Q)cp -r doc $$(PREPARE_DEST_DIR)
$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR) $$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
endef
define DEF_INSTALLER
$$(eval $$(call DEF_PREPARE,dir-$(1)))
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(1),))
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(CFG_TARGET),-with-target-libs))
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
@$(call E, build: $$@) @$(call E, build: $$@)
$$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1) $$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1)

4
mk/install.mk
View file

@ -14,12 +14,12 @@ else
MAYBE_DISABLE_VERIFY= MAYBE_DISABLE_VERIFY=
endif endif
install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir install: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" $(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
# Remove tmp files while we can because they may have been created under sudo # Remove tmp files while we can because they may have been created under sudo
$(Q)rm -R tmp/dist $(Q)rm -R tmp/dist
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir uninstall: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" $(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
# Remove tmp files while we can because they may have been created under sudo # Remove tmp files while we can because they may have been created under sudo
$(Q)rm -R tmp/dist $(Q)rm -R tmp/dist