diff options
Diffstat (limited to 'package/Makefile.in')
-rw-r--r-- | package/Makefile.in | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 7daa3b404..f0dc47a36 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -130,7 +130,7 @@ TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH))) #")) #TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) -TARGET_PATH="$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" +TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) @@ -205,6 +205,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/mipsel-.*/mipsel/' \ -e 's/cris.*/cris/' \ -e 's/i[3-9]86/i386/' \ + -e 's/xtensa.*/xtensa/' \ ) GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX)) #") @@ -380,23 +381,8 @@ else ENABLE_DEBUG:= endif - # X Windowing system -XSERVER:= -ifeq ($(BR2_PACKAGE_TINYX),y) -XSERVER+=tinyx -endif -ifeq ($(BR2_PACKAGE_XORG),y) -XSERVER+=xorg -endif -ifeq ($(BR2_PACKAGE_XORG7),y) -XSERVER+=xserver_xorg-server -endif -ifeq ($(BR2_PACKAGE_XGGI),y) -XSERVER+=xggi -endif - X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX))) #")) |