diff --git a/mk/install.mk b/mk/install.mk index 156a545e1ad..c9a0aa22e13 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -12,117 +12,33 @@ # 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)/ -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)/ -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 +install: PREPARE_HOST=$(CFG_BUILD) +install: PREPARE_TARGETS=$(CFG_BUILD) +install: PREPARE_STAGE=$(ISTAGE) +install: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) +install: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) +install: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) +install: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) +install: PREPARE_SOURCE_DIR=$(PREPARE_HOST)/stage$(PREPARE_STAGE) +install: PREPARE_SOURCE_BIN_DIR=$(PREPARE_SOURCE_DIR)/bin +install: PREPARE_SOURCE_LIB_DIR=$(PREPARE_SOURCE_DIR)/$(CFG_LIBDIR_RELATIVE) +install: PREPARE_SOURCE_MAN_DIR=$(S)/man +install: PREPARE_DEST_BIN_DIR=$(CFG_PREFIX)/bin +install: PREPARE_DEST_LIB_DIR=$(CFG_LIBDIR) +install: PREPARE_DEST_MAN_DIR=$(CFG_MANDIR)/man1 +install: prepare-everything + + +# Uninstall code + 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 - -# 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)) - -# 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) - $$(Q)$$(call INSTALL_LIB,libcompiler-rt.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) - $$(Q)$$(call INSTALL_LIB,libcompiler-rt.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 +INSTALL_TOOLS := $(PREPARE_TOOLS) # Shorthand for build/stageN/bin HB = $(HBIN$(ISTAGE)_H_$(CFG_BUILD)) @@ -134,39 +50,6 @@ 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))) @@ -188,6 +71,10 @@ endef $(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 define DEF_ADB_DEVICE_STATUS diff --git a/mk/prepare.mk b/mk/prepare.mk index 0d3d7c34a94..7757287cd54 100644 --- a/mk/prepare.mk +++ b/mk/prepare.mk @@ -36,6 +36,8 @@ prepare-base: PREPARE_DEST_LIB_DIR=$(PREPARE_DEST_DIR)/$(CFG_LIBDIR_RELATIVE) prepare-base: PREPARE_DEST_MAN_DIR=$(PREPARE_DEST_DIR)/man1 prepare-base: prepare-host prepare-targets +prepare-everything: prepare-host prepare-targets + DEFAULT_PREPARE_DIR_CMD = umask 022 && mkdir -p DEFAULT_PREPARE_BIN_CMD = install -m755 DEFAULT_PREPARE_LIB_CMD = install -m644