summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk2
-rw-r--r--mk/package.mk3
-rw-r--r--mk/vars.mk2
3 files changed, 5 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk
index ef551741a..a72cd4f05 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -135,7 +135,7 @@ endif
${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include,usr/lib} \
- ${STAGING_HOST_DIR}/{bin,lib}
+ ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib}
${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
diff --git a/mk/package.mk b/mk/package.mk
index e42ced661..cab7b6947 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -75,9 +75,12 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \
${HOST_CONFIGURE_OPTS} \
CC='${TARGET_CC}' \
CXX='${TARGET_CXX}' \
+ LD='${TARGET_LD}' \
AR='${TARGET_CROSS}ar' \
RANLIB='${TARGET_CROSS}ranlib' \
NM='${TARGET_CROSS}nm' \
+ OBJCOPY='${TARGET_CROSS}objcopy' \
+ RANLIB='${TARGET_CROSS}ranlib' \
STRIP='${TARGET_CROSS}strip' \
CROSS="$(TARGET_CROSS)"
endif
diff --git a/mk/vars.mk b/mk/vars.mk
index 6a0f50a2f..8bbb7765b 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -51,7 +51,7 @@ BIN_DIR_PFX:= $(BASE_DIR)/bin
PACKAGE_DIR:= $(BIN_DIR)/packages
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
-TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
+TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
ifeq ($(ADK_NATIVE),y)