summaryrefslogtreecommitdiffstats
path: root/rules.mk
diff options
context:
space:
mode:
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk18
1 files changed, 13 insertions, 5 deletions
diff --git a/rules.mk b/rules.mk
index 0822979012..8f42fe3129 100644
--- a/rules.mk
+++ b/rules.mk
@@ -192,9 +192,17 @@ HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include
HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib
+ifeq ($(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_6),)
+ TARGET_AR:=$(TARGET_CROSS)gcc-ar
+ TARGET_RANLIB:=$(TARGET_CROSS)gcc-ranlib
+ TARGET_NM:=$(TARGET_CROSS)gcc-nm
+else
+ TARGET_AR:=$(TARGET_CROSS)ar
+ TARGET_RANLIB:=$(TARGET_CROSS)ranlib
+ TARGET_NM:=$(TARGET_CROSS)nm
+endif
+
TARGET_CC:=$(TARGET_CROSS)gcc
-TARGET_AR:=$(TARGET_CROSS)ar
-TARGET_RANLIB:=$(TARGET_CROSS)ranlib
TARGET_CXX:=$(TARGET_CROSS)g++
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
@@ -223,14 +231,14 @@ ifneq ($(CONFIG_CCACHE),)
endif
TARGET_CONFIGURE_OPTS = \
- AR=$(TARGET_CROSS)ar \
+ AR="$(TARGET_AR)" \
AS="$(TARGET_CC) -c $(TARGET_ASFLAGS)" \
LD=$(TARGET_CROSS)ld \
- NM=$(TARGET_CROSS)nm \
+ NM="$(TARGET_NM)" \
CC="$(TARGET_CC)" \
GCC="$(TARGET_CC)" \
CXX="$(TARGET_CXX)" \
- RANLIB=$(TARGET_CROSS)ranlib \
+ RANLIB="$(TARGET_RANLIB)" \
STRIP=$(TARGET_CROSS)strip \
OBJCOPY=$(TARGET_CROSS)objcopy \
OBJDUMP=$(TARGET_CROSS)objdump \