mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:11:46 +02:00
add $(STAGING_DIR)/host, which contains target specific, but host executable files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9939 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f140b7d324
commit
bb25bc5138
@ -72,15 +72,11 @@ define Build/DefaultTargets
|
||||
$(STAMP_INSTALLED): $(STAMP_BUILT)
|
||||
$(NO_TRACE_MAKE) clean-staging
|
||||
rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
|
||||
mkdir -p $(TMP_DIR)/stage-$(PKG_NAME) $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
|
||||
$(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME)/target,$(TMP_DIR)/stage-$(PKG_NAME)/host)
|
||||
if [ -d $(TMP_DIR)/stage-$(PKG_NAME)/target ]; then \
|
||||
(cd $(TMP_DIR)/stage-$(PKG_NAME)/target; find > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
|
||||
$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/target/* $(STAGING_DIR)/; \
|
||||
fi
|
||||
if [ -d $(TMP_DIR)/stage-$(PKG_NAME)/host ]; then \
|
||||
(cd $(TMP_DIR)/stage-$(PKG_NAME)/host; find > $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list); \
|
||||
$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/host/* $(STAGING_DIR_HOST)/; \
|
||||
mkdir -p $(TMP_DIR)/stage-$(PKG_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
|
||||
$(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)
|
||||
if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
|
||||
(cd $(TMP_DIR)/stage-$(PKG_NAME); find > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
|
||||
$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
|
||||
fi
|
||||
rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
|
||||
touch $$@
|
||||
@ -173,12 +169,12 @@ compile:
|
||||
install:
|
||||
clean-staging: FORCE
|
||||
rm -f $(STAMP_INSTALLED)
|
||||
for dir in "$(STAGING_DIR)" "$(STAGING_DIR_HOST)"; do (\
|
||||
cd $$dir; \
|
||||
@-(\
|
||||
cd "$(STAGING_DIR)"; \
|
||||
if [ -f packages/$(PKG_NAME).list ]; then \
|
||||
cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \
|
||||
fi; \
|
||||
) done;
|
||||
)
|
||||
|
||||
clean: clean-staging FORCE
|
||||
$(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))
|
||||
|
2
rules.mk
2
rules.mk
@ -56,7 +56,7 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
|
||||
TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-linux-uclibc-)
|
||||
endif
|
||||
|
||||
TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(PATH)
|
||||
TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/host/bin:$(PATH)
|
||||
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) -fhonour-copts
|
||||
TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
||||
TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
|
||||
|
Loading…
Reference in New Issue
Block a user