Commit bd07d92a authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Makefile: introduce $(HOST_DIR) for host binaries 

Add HOST_DIR directory handling. HOST_DIR should be used just like
STAGING_DIR, but for host files instead of target ones.
parent ad529c62

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ $(BR2_DEPENDS_DIR): .config 
	cp -dpRf $(CONFIG)/buildroot-config $@



dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \

	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \

	$(PROJECT_BUILD_DIR)/autotools-stamps



$(BASE_TARGETS): dirs
@@ -294,7 +294,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL) 
	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \

	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \

	$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \

	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \

	$(PROJECT_BUILD_DIR)/autotools-stamps



#############################################################
@@ -303,7 +303,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL) 
# dependencies anywhere else

#

#############################################################

$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) \

$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \

	$(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR):

	@mkdir -p $@

package/Makefile.in

+3 −1
Original line number Diff line number Diff line
@@ -290,7 +290,9 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ 
		ORIGINAL_AS_FOR_TARGET="$(TARGET_AS)" \

		ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \

		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \

		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)"

		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \

		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \

		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"



#######################################################################

# settings we need to pass to configure

project/Makefile.in

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ GNU_TARGET_SUFFIX:=-$(strip $(subst ",, $(BR2_GNU_TARGET_SUFFIX))) 
STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR)))

#"))



# packages compiled for the host goes here

HOST_DIR:=$(BUILD_DIR)/host_dir



# All configurable packages (like Busybox,Linux etc) should be built

# in PROJECT_BUILD_DIR

PROJECT_BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)project_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)/$(PROJECT)