From 966c37f7d27bf95047e4c6155366fba83a4b891a Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Fri, 28 Sep 2007 19:49:13 +0000
Subject: [PATCH] Sort HOST/TARGET_CONFIGURE_OPTS, add some more, needed for
 gcc-4.1.2

---
 package/Makefile.in | 61 +++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index cc5d7be6fe..8b16e48676 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -136,25 +136,6 @@ 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)" \
-		CXX_FOR_BUILD="$(HOSTCXX)" \
-		LD_FOR_BUILD="$(HOSTLD)" \
-		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
-		CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
-		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
-		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
-		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
-		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-		STAGING_DIR="$(STAGING_DIR)"
-
-HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		AR_FOR_BUILD="$(HOSTAR)" \
 		AS_FOR_BUILD="$(HOSTAS)" \
 		CC_FOR_BUILD="$(HOSTCC)" \
@@ -164,19 +145,57 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		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)" \
+		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+		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)" \
-		LD="$(HOSTLD) $(HOST_LDFLAGS)" \
+		CPP="$(HOSTCPP) $(HOST_CFLAGS)" \
+		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_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