# option. This file may not be copied, modified, or distributed
# except according to those terms.
-# FIXME: Docs are currently not installed from the stageN dirs.
-# For consistency it might be desirable for stageN to be an exact
-# mirror of the installation directory structure.
-
-# Installation macros.
-# For INSTALL,
-# $(1) is the source dirctory
-# $(2) is the destination directory
-# $(3) is the filename/libname-glob
-ifdef VERBOSE
- INSTALL = install -m755 $(1)/$(3) $(DESTDIR)$(2)/$(3)
-else
- INSTALL = $(Q)$(call E, install: $(DESTDIR)$(2)/$(3)) && install -m755 $(1)/$(3) $(DESTDIR)$(2)/$(3)
-endif
-
-# For MK_INSTALL_DIR
-# $(1) is the directory to create
-MK_INSTALL_DIR = (umask 022 && mkdir -p $(DESTDIR)$(1))
-
-# For INSTALL_LIB,
-# Target-specific $(LIB_SOURCE_DIR) is the source directory
-# Target-specific $(LIB_DESTIN_DIR) is the destination directory
-# $(1) is the filename/libname-glob
-ifdef VERBOSE
- DO_INSTALL_LIB = install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(DESTDIR)$(LIB_DESTIN_DIR)/
+ifdef CFG_DISABLE_VERIFY_INSTALL
+MAYBE_DISABLE_VERIFY=--disable-verify
else
- DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(DESTDIR)$(LIB_DESTIN_DIR)/$(1)) && \
- install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(DESTDIR)$(LIB_DESTIN_DIR)/
+MAYBE_DISABLE_VERIFY=
endif
-# Target-specific $(LIB_SOURCE_DIR) is the source directory
-# Target-specific $(LIB_DESTIN_DIR) is the destination directory
-# $(1) is the filename/libname-glob
-define INSTALL_LIB
- $(if $(filter-out 1,$(words $(wildcard $(LIB_SOURCE_DIR)/$(1)))), \
- $(error Aborting install because more than one library matching \
- $(1) is present in build tree $(LIB_SOURCE_DIR): \
- $(wildcard $(LIB_SOURCE_DIR)/$(1))))
- $(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(LIB_SOURCE_DIR)/$(1))))"; \
- MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(LIB_SOURCE_DIR)/$(1)))),\
- $(wildcard $(LIB_DESTIN_DIR)/$(1)))"; \
- if [ -n "$$MATCHES" ]; then \
- echo "warning: one or libraries matching Rust library '$(1)'" && \
- echo " (other than '$$LIB_NAME' itself) already present" && \
- echo " at destination $(LIB_DESTIN_DIR):" && \
- echo $$MATCHES ; \
- fi
- $(call DO_INSTALL_LIB,$(1))
-endef
-
-# The stage we install from
-ISTAGE = 2
-
-PREFIX_ROOT = $(CFG_PREFIX)
-PREFIX_BIN = $(PREFIX_ROOT)/bin
-PREFIX_LIB = $(CFG_LIBDIR)
-
-INSTALL_TOOLS := $(filter-out compiletest, $(TOOLS))
-
-define INSTALL_PREPARE_N
- # $(1) is the target triple
- # $(2) is the host triple
+install: dist-install-dir-$(CFG_BUILD)-with-target-libs
+ $(Q)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
+ $(Q)rm -R tmp/dist
-# T{B,L} == Target {Bin, Lib} for stage ${ISTAGE}
-TB$(1)$(2) = $$(TBIN$$(ISTAGE)_T_$(1)_H_$(2))
-TL$(1)$(2) = $$(TLIB$$(ISTAGE)_T_$(1)_H_$(2))
+uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs
+ $(Q)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
+ $(Q)rm -R tmp/dist
-# PT{R,B,L} == Prefix Target {Root, Bin, Lib}
-PTR$(1)$(2) = $$(PREFIX_LIB)/$(CFG_RUSTLIBDIR)/$(1)
-PTB$(1)$(2) = $$(PTR$(1)$(2))/bin
-PTL$(1)$(2) = $$(PTR$(1)$(2))/lib
-endef
-
-$(foreach target,$(CFG_TARGET), \
- $(eval $(call INSTALL_PREPARE_N,$(target),$(CFG_BUILD))))
-
-define INSTALL_TARGET_N
-install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
-install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
-install-target-$(1)-host-$(2): \
- $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) \
- $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
- $$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
- $$(Q)$$(foreach crate,$$(TARGET_CRATES),\
- $$(call INSTALL_LIB,$$(call CFG_LIB_GLOB_$(1),$$(crate)));\
- $$(call INSTALL_LIB,$$(call CFG_RLIB_GLOB,$$(crate)));)
- $$(Q)$$(call INSTALL_LIB,libmorestack.a)
-
-endef
-
-define INSTALL_HOST_N
-
-install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
-install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
-install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
- $$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
- $$(Q)$$(foreach crate,$$(CRATES),\
- $$(call INSTALL_LIB,$$(call CFG_LIB_GLOB_$(1),$$(crate)));)
- $$(Q)$$(foreach crate,$$(TARGET_CRATES),\
- $$(call INSTALL_LIB,$$(call CFG_RLIB_GLOB,$$(crate)));)
- $$(Q)$$(call INSTALL_LIB,libmorestack.a)
-endef
-
-$(foreach target,$(CFG_TARGET), \
- $(if $(findstring $(target), $(CFG_BUILD)), \
- $(eval $(call INSTALL_HOST_N,$(target),$(CFG_BUILD))), \
- $(eval $(call INSTALL_TARGET_N,$(target),$(CFG_BUILD)))))
-
-INSTALL_TARGET_RULES = $(foreach target,$(CFG_TARGET), \
- install-target-$(target)-host-$(CFG_BUILD))
-
-install: all install-host install-targets
-
-# Shorthand for build/stageN/bin
-HB = $(HBIN$(ISTAGE)_H_$(CFG_BUILD))
-HB2 = $(HBIN2_H_$(CFG_BUILD))
-# Shorthand for build/stageN/lib
-HL = $(HLIB$(ISTAGE)_H_$(CFG_BUILD))
-# Shorthand for the prefix bin directory
-PHB = $(PREFIX_BIN)
-# Shorthand for the prefix bin directory
-PHL = $(PREFIX_LIB)
-
-install-host%: LIB_SOURCE_DIR=$(HL)
-install-host%: LIB_DESTIN_DIR=$(PHL)
-install-host: \
- install-host-prep \
- $(foreach tool,$(INSTALL_TOOLS),install-host-tool-$(tool))
-
-install-host-prep: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD)_H_$(CFG_BUILD))
- $(Q)$(call MK_INSTALL_DIR,$(PREFIX_BIN))
- $(Q)$(call MK_INSTALL_DIR,$(PREFIX_LIB))
- $(Q)$(call MK_INSTALL_DIR,$(CFG_MANDIR)/man1)
-
-define INSTALL_HOST_TOOL
-install-host-tool-$(1): \
- $$(foreach dep,$$(TOOL_DEPS_$(1)),install-host-lib-$$(dep)) \
- $$(CSREQ$$(ISTAGE)_T_$$(CFG_BUILD)_H_$$(CFG_BUILD))
- $$(Q)$$(call INSTALL,$$(HB2),$$(PHB),$(1)$$(X_$$(CFG_BUILD)))
- $$(Q)$$(call INSTALL,$$(S)/man,$$(CFG_MANDIR)/man1,$(1).1)
-endef
-
-$(foreach tool,$(INSTALL_TOOLS),$(eval $(call INSTALL_HOST_TOOL,$(tool))))
-
-define INSTALL_HOST_LIB
-install-host-lib-$(1): \
- $$(foreach dep,$$(RUST_DEPS_$(1)),install-host-lib-$$(dep)) \
- $$(CSREQ$$(ISTAGE)_T_$$(CFG_BUILD)_H_$$(CFG_BUILD))
- $$(Q)$$(call INSTALL_LIB,$$(call CFG_LIB_GLOB_$$(CFG_BUILD),$(1)))
-endef
-
-$(foreach lib,$(CRATES),$(eval $(call INSTALL_HOST_LIB,$(lib))))
-
-install-targets: $(INSTALL_TARGET_RULES)
-
-
-HOST_LIB_FROM_HL_GLOB = \
- $(patsubst $(HL)/%,$(PHL)/%,$(wildcard $(HL)/$(1)))
-
-uninstall: $(foreach tool,$(INSTALL_TOOLS),uninstall-tool-$(tool))
- $(Q)rm -Rf $(PHL)/$(CFG_RUSTLIBDIR)
-
-define UNINSTALL_TOOL
-uninstall-tool-$(1): $$(foreach dep,$$(TOOL_DEPS_$(1)),uninstall-lib-$$(dep))
- $$(Q)rm -f $$(PHB)/$(1)$$(X_$$(CFG_BUILD))
- $$(Q)rm -f $$(CFG_MANDIR)/man1/$(1).1
-endef
-
-$(foreach tool,$(INSTALL_TOOLS),$(eval $(call UNINSTALL_TOOL,$(tool))))
-
-define UNINSTALL_LIB
-uninstall-lib-$(1): $$(foreach dep,$$(RUST_DEPS_$(1)),uninstall-lib-$$(dep))
- $$(Q)rm -f $$(call HOST_LIB_FROM_HL_GLOB,$$(call CFG_LIB_GLOB_$$(CFG_BUILD),$(1)))
-endef
+######################################################################
+# Android remote installation
+######################################################################
-$(foreach lib,$(CRATES),$(eval $(call UNINSTALL_LIB,$(lib))))
+# Android runtime setup
+# FIXME: This probably belongs somewhere else
# target platform specific variables
# for arm-linux-androidabi