diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Makefile.in | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 8b16e4867..360685d73 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -10,14 +10,14 @@ MAKE1:=$(HOSTMAKE) MAKE="$(firstword $(HOSTMAKE)) -j1" MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL) +######################################################################### ifeq ($(BR2_TOOLCHAIN_SOURCE),y) TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib - +TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib ifeq ($(BR2_TOOLCHAIN_SYSROOT),y) TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT) -#TARGET_LDFLAGS=-Wl,$(BR2_SYSROOT) +TARGET_LDFLAGS+= $(BR2_SYSROOT) endif CC_TARGET_TUNE_:=$(strip $(subst ",,$(BR2_GCC_TARGET_TUNE))) @@ -87,10 +87,13 @@ GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX) KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- endif +TARGET_AR=$(TARGET_CROSS)ar +TARGET_AS=$(TARGET_CROSS)as TARGET_CC=$(TARGET_CROSS)gcc TARGET_CXX=$(TARGET_CROSS)g++ -TARGET_AR=$(TARGET_CROSS)ar +TARGET_LD=$(TARGET_CROSS)ld TARGET_RANLIB=$(TARGET_CROSS)ranlib +TARGET_OBJCOPY=$(TARGET_CROSS)objcopy TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig INSTALL=/usr/bin/install ifeq ($(BR2_STRIP_strip),y) @@ -134,26 +137,28 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ NM=$(TARGET_CROSS)nm \ CC="$(TARGET_CROSS)gcc $(TARGET_CFLAGS)" \ GCC="$(TARGET_CROSS)gcc $(TARGET_CFLAGS)" \ - CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS)" \ CPP="$(TARGET_CROSS)cpp $(TARGET_CFLAGS)" \ + CXX="$(TARGET_CROSS)g++ $(TARGET_CXXFLAGS)" \ + FC="$(TARGET_CROSS)gfortran $(TARGET_FCFLAGS)" \ + 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)" \ + FC_FOR_BUILD="$(HOSTFC)" \ LD_FOR_BUILD="$(HOSTLD)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \ 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)" \ @@ -170,7 +175,7 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ NM="$(HOSTNM)" \ CC="$(HOSTCC) $(HOST_CFLAGS)" \ GCC="$(HOSTCC) $(HOST_CFLAGS)" \ - CXX="$(HOSTCXX)" \ + CXX="$(HOSTCXX) $(HOST_CXXFLAGS)" \ CPP="$(HOSTCPP) $(HOST_CFLAGS)" \ AR_FOR_BUILD="$(HOSTAR)" \ AS_FOR_BUILD="$(HOSTAS)" \ @@ -178,9 +183,11 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ GCC_FOR_BUILD="$(HOSTCC)" \ CXX_FOR_BUILD="$(HOSTCXX)" \ LD_FOR_BUILD="$(HOSTLD)" \ + FC_FOR_BUILD="$(HOSTFC)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \ AR_FOR_TARGET=$(TARGET_CROSS)ar \ AS_FOR_TARGET=$(TARGET_CROSS)as \ CC_FOR_TARGET=$(TARGET_CROSS)gcc \ |