summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-28 22:15:19 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-28 22:15:19 +0000
commitfbb5f1b94e40849540514b8de6f44f5a47267626 (patch)
tree5b1c9785806eecd797688fc02a15e122447c208e /package
parentbb9e6a7d9e1632b17525151673d5d68ab5765a7c (diff)
- cleanup configure options
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.in87
1 files changed, 49 insertions, 38 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 360685d73..66e6f00f5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -90,31 +90,42 @@ endif
TARGET_AR=$(TARGET_CROSS)ar
TARGET_AS=$(TARGET_CROSS)as
TARGET_CC=$(TARGET_CROSS)gcc
+TARGET_CPP=$(TARGET_CROSS)cpp
TARGET_CXX=$(TARGET_CROSS)g++
+ifeq ($(BR2_GCC_VERSION_3_4_6),y)
+TARGET_FC=$(TARGET_CROSS)g77
+else
+TARGET_FC=$(TARGET_CROSS)gfortran
+endif
TARGET_LD=$(TARGET_CROSS)ld
+TARGET_NM=$(TARGET_CROSS)nm
TARGET_RANLIB=$(TARGET_CROSS)ranlib
TARGET_OBJCOPY=$(TARGET_CROSS)objcopy
+TARGET_OBJDUMP=$(TARGET_CROSS)objdump
TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig
-INSTALL=/usr/bin/install
ifeq ($(BR2_STRIP_strip),y)
STRIP_DISCARD_ALL:=--discard-all
STRIP_STRIP_UNNEEDED:=--strip-unneeded
STRIP_STRIP_ALL:=--strip-all
REMOVE_SECTION_COMMENT:=--remove-section=.comment
REMOVE_SECTION_NOTE:=--remove-section=.note
-STRIP=$(TARGET_CROSS)strip $(REMOVE_SECTION_COMMENT) $(REMOVE_SECTION_NOTE)
+TARGET_STRIP=$(TARGET_CROSS)strip $(REMOVE_SECTION_COMMENT) $(REMOVE_SECTION_NOTE)
+STRIP=$(TARGET_STRIP)
endif
ifeq ($(BR2_STRIP_sstrip),y)
-STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
STRIP_DISCARD_ALL:=
STRIP_STRIP_UNNEEDED:=
STRIP_STRIP_ALL:=
REMOVE_SECTION_COMMENT:=
REMOVE_SECTION_NOTE:=
+TARGET_STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
+STRIP=$(TARGET_STRIP)
endif
ifeq ($(BR2_STRIP_none),y)
-STRIP=true -Not_stripping
+TARGET_STRIP=true -Not_stripping
+STRIP=$(TARGET_STRIP)
endif
+INSTALL=/usr/bin/install
HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-e 's/sparc.*/sparc/' \
@@ -131,18 +142,18 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
#")
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
- AR=$(TARGET_CROSS)ar \
- AS=$(TARGET_CROSS)as \
- LD="$(TARGET_CROSS)ld $(TARGET_LDFLAGS)" \
- NM=$(TARGET_CROSS)nm \
- CC="$(TARGET_CROSS)gcc $(TARGET_CFLAGS)" \
- GCC="$(TARGET_CROSS)gcc $(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=$(TARGET_AR) \
+ AS=$(TARGET_AS) \
+ LD="$(TARGET_LD) $(TARGET_LDFLAGS)" \
+ NM=$(TARGET_NM) \
+ CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
+ GCC="$(TARGET_CC) $(TARGET_CFLAGS)" \
+ CPP="$(TARGET_CPP) $(TARGET_CFLAGS)" \
+ CXX="$(TARGET_CXX) $(TARGET_CXXFLAGS)" \
+ FC="$(TARGET_FC) $(TARGET_FCFLAGS)" \
+ RANLIB=$(TARGET_RANLIB) \
+ STRIP=$(TARGET_STRIP) \
+ OBJCOPY=$(TARGET_OBJCOPY) \
AR_FOR_BUILD="$(HOSTAR)" \
AS_FOR_BUILD="$(HOSTAS)" \
CC_FOR_BUILD="$(HOSTCC)" \
@@ -154,13 +165,13 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
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 \
- DEFAULT_ASSEMBLER=$(TARGET_CROSS)as \
- DEFAULT_LINKER=$(TARGET_CROSS)ld \
+ AR_FOR_TARGET=$(TARGET_AR) \
+ AS_FOR_TARGET=$(TARGET_AS) \
+ CC_FOR_TARGET=$(TARGET_CC) \
+ LD_FOR_TARGET=$(TARGET_LD) \
+ NM_FOR_TARGET=$(TARGET_NM) \
+ DEFAULT_ASSEMBLER=$(TARGET_AS) \
+ DEFAULT_LINKER=$(TARGET_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)" \
@@ -188,21 +199,21 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
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_FOR_TARGET=$(TARGET_CROSS)ranlib \
- STRIP_FOR_TARGET=$(TARGET_CROSS)strip \
- 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
+ AR_FOR_TARGET=$(TARGET_AR) \
+ AS_FOR_TARGET=$(TARGET_AS) \
+ CC_FOR_TARGET=$(TARGET_CC) \
+ LD_FOR_TARGET=$(TARGET_LD) \
+ NM_FOR_TARGET=$(TARGET_NM) \
+ RANLIB_FOR_TARGET=$(TARGET_RANLIB) \
+ STRIP_FOR_TARGET=$(TARGET_STRIP) \
+ OBJCOPY_FOR_TARGET=$(TARGET_OBJCOPY) \
+ OBJDUMP_FOR_TARGET=$(TARGET_OBJDUMP) \
+ DEFAULT_ASSEMBLER=$(TARGET_AS) \
+ DEFAULT_LINKER=$(TARGET_LD) \
+ ORIGINAL_AS_FOR_TARGET=$(TARGET_AS) \
+ ORIGINAL_LD_FOR_TARGET=$(TARGET_LD) \
+ ORIGINAL_NM_FOR_TARGET=$(TARGET_NM) \
+ ORIGINAL_OBJDUMP_FOR_TARGET=$(TARGET_OBJDUMP)
#######################################################################
# settings we need to pass to configure