summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/Makefile.in39
1 files changed, 29 insertions, 10 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index cc5d7be6f..8b16e4867 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -136,17 +136,26 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
GCC="$(TARGET_CROSS)gcc $(TARGET_CFLAGS)" \
CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS)" \
CPP="$(TARGET_CROSS)cpp $(TARGET_CFLAGS)" \
- RANLIB=$(TARGET_CROSS)ranlib \
- STRIP=$(TARGET_CROSS)strip \
- OBJCOPY=$(TARGET_CROSS)objcopy \
AR_FOR_BUILD="$(HOSTAR)" \
AS_FOR_BUILD="$(HOSTAS)" \
CC_FOR_BUILD="$(HOSTCC)" \
+ GCC_FOR_BUILD="$(HOSTCC)" \
CXX_FOR_BUILD="$(HOSTCXX)" \
LD_FOR_BUILD="$(HOSTLD)" \
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
+ AR_FOR_TARGET=$(TARGET_CROSS)ar \
+ AS_FOR_TARGET=$(TARGET_CROSS)as \
+ CC_FOR_TARGET=$(TARGET_CROSS)gcc \
+ LD_FOR_TARGET=$(TARGET_CROSS)ld \
+ NM_FOR_TARGET=$(TARGET_CROSS)nm \
+ RANLIB=$(TARGET_CROSS)ranlib \
+ STRIP=$(TARGET_CROSS)strip \
+ OBJCOPY=$(TARGET_CROSS)objcopy \
+ OBJDUMP=$(TARGET_CROSS)objdump \
+ DEFAULT_ASSEMBLER=$(TARGET_CROSS)as \
+ DEFAULT_LINKER=$(TARGET_CROSS)ld \
PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
@@ -155,6 +164,14 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
STAGING_DIR="$(STAGING_DIR)"
HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
+ AR="$(HOSTAR)" \
+ AS="$(HOSTAS)" \
+ LD="$(HOSTLD) $(HOST_LDFLAGS)" \
+ NM="$(HOSTNM)" \
+ CC="$(HOSTCC) $(HOST_CFLAGS)" \
+ GCC="$(HOSTCC) $(HOST_CFLAGS)" \
+ CXX="$(HOSTCXX)" \
+ CPP="$(HOSTCPP) $(HOST_CFLAGS)" \
AR_FOR_BUILD="$(HOSTAR)" \
AS_FOR_BUILD="$(HOSTAS)" \
CC_FOR_BUILD="$(HOSTCC)" \
@@ -164,19 +181,21 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
- AR="$(HOSTAR)" \
- AS="$(HOSTAS)" \
- CC="$(HOSTCC) $(HOST_CFLAGS)" \
- GCC="$(HOSTCC) $(HOST_CFLAGS)" \
- CXX="$(HOSTCXX)" \
- LD="$(HOSTLD) $(HOST_LDFLAGS)" \
AR_FOR_TARGET=$(TARGET_CROSS)ar \
AS_FOR_TARGET=$(TARGET_CROSS)as \
+ CC_FOR_TARGET=$(TARGET_CROSS)gcc \
LD_FOR_TARGET=$(TARGET_CROSS)ld \
NM_FOR_TARGET=$(TARGET_CROSS)nm \
RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
STRIP_FOR_TARGET=$(TARGET_CROSS)strip \
- OBJCOPY_FOR_TARGET=$(TARGET_CROSS)objcopy
+ OBJCOPY_FOR_TARGET=$(TARGET_CROSS)objcopy \
+ OBJDUMP_FOR_TARGET=$(TARGET_CROSS)objdump \
+ DEFAULT_ASSEMBLER=$(TARGET_CROSS)as \
+ DEFAULT_LINKER=$(TARGET_CROSS)ld \
+ ORIGINAL_AS_FOR_TARGET=$(TARGET_CROSS)as \
+ ORIGINAL_LD_FOR_TARGET=$(TARGET_CROSS)ld \
+ ORIGINAL_NM_FOR_TARGET=$(TARGET_CROSS)nm \
+ ORIGINAL_OBJDUMP_FOR_TARGET=$(TARGET_CROSS)objdump
#######################################################################
# settings we need to pass to configure