From 91a2680a50633216f8498f7ff56d317599fff09b Mon Sep 17 00:00:00 2001 From: Eric Andersen <andersen@codepoet.org> Date: Sat, 27 Sep 2003 01:11:27 +0000 Subject: Fixup the binutils_target build --- make/binutils.mk | 40 +++++++---------------------------- sources/binutils-010-crossbuild.patch | 32 ---------------------------- 2 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 sources/binutils-010-crossbuild.patch diff --git a/make/binutils.mk b/make/binutils.mk index d5cb75d91..680cc6615 100644 --- a/make/binutils.mk +++ b/make/binutils.mk @@ -117,22 +117,14 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched mkdir -p $(BINUTILS_DIR2) mkdir -p $(TARGET_DIR)/usr/include mkdir -p $(TARGET_DIR)/usr/$(GNU_TARGET_NAME)/ - (cd $(BINUTILS_DIR2); ln -fs $(ARCH)-linux build-$(GNU_TARGET_NAME)) (cd $(BINUTILS_DIR2); \ - AR=ar \ - AS=as \ - LD=ld \ - NM=nm \ - RANLIB=ranlib \ - CC=$(HOSTCC) \ - GCC=$(HOSTCC) \ - CXX=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) \ + CC_FOR_BUILD=$(HOSTCC) \ + CXX_FOR_BUILD=$(HOSTCC) \ AR_FOR_TARGET=$(TARGET_CROSS)ar \ AS_FOR_TARGET=$(TARGET_CROSS)as \ LD_FOR_TARGET=$(TARGET_CROSS)ld \ NM_FOR_TARGET=$(TARGET_CROSS)nm \ - OBJDUMP_FOR_TARGET=$(TARGET_CROSS)objdump \ - OBJCOPY_FOR_TARGET=$(TARGET_CROSS)objcopy \ CC_FOR_TARGET=$(TARGET_CROSS)gcc \ GCC_FOR_TARGET=$(TARGET_CROSS)gcc \ CXX_FOR_TARGET=$(TARGET_CROSS)g++ \ @@ -140,7 +132,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(BINUTILS_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ + --build=$(ARCH)-linux \ --prefix=/usr \ --exec-prefix=/usr \ --bindir=/usr/bin \ @@ -159,20 +151,12 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured $(MAKE) -C $(BINUTILS_DIR2) \ - AR=ar \ - AS=as \ - LD=ld \ - NM=nm \ - RANLIB=ranlib \ - CC=$(HOSTCC) \ - GCC=$(HOSTCC) \ - CXX=$(HOSTCC) \ + CC_FOR_BUILD=$(HOSTCC) \ + CXX_FOR_BUILD=$(HOSTCC) \ AR_FOR_TARGET=$(TARGET_CROSS)ar \ AS_FOR_TARGET=$(TARGET_CROSS)as \ LD_FOR_TARGET=$(TARGET_CROSS)ld \ NM_FOR_TARGET=$(TARGET_CROSS)nm \ - OBJDUMP_FOR_TARGET=$(TARGET_CROSS)objdump \ - OBJCOPY_FOR_TARGET=$(TARGET_CROSS)objcopy \ CC_FOR_TARGET=$(TARGET_CROSS)gcc \ GCC_FOR_TARGET=$(TARGET_CROSS)gcc \ CXX_FOR_TARGET=$(TARGET_CROSS)g++ \ @@ -181,20 +165,12 @@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump $(MAKE) -C $(BINUTILS_DIR2) \ - AR=ar \ - AS=as \ - LD=ld \ - NM=nm \ - RANLIB=ranlib \ - CC=$(HOSTCC) \ - GCC=$(HOSTCC) \ - CXX=$(HOSTCC) \ + CC_FOR_BUILD=$(HOSTCC) \ + CXX_FOR_BUILD=$(HOSTCC) \ AR_FOR_TARGET=$(TARGET_CROSS)ar \ AS_FOR_TARGET=$(TARGET_CROSS)as \ LD_FOR_TARGET=$(TARGET_CROSS)ld \ NM_FOR_TARGET=$(TARGET_CROSS)nm \ - OBJDUMP_FOR_TARGET=$(TARGET_CROSS)objdump \ - OBJCOPY_FOR_TARGET=$(TARGET_CROSS)objcopy \ CC_FOR_TARGET=$(TARGET_CROSS)gcc \ GCC_FOR_TARGET=$(TARGET_CROSS)gcc \ CXX_FOR_TARGET=$(TARGET_CROSS)g++ \ diff --git a/sources/binutils-010-crossbuild.patch b/sources/binutils-010-crossbuild.patch deleted file mode 100644 index cf6ae9fe6..000000000 --- a/sources/binutils-010-crossbuild.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN binutils-2.14.90.0.5/bfd/doc.orig/Makefile.am binutils-2.14.90.0.5/bfd/doc/Makefile.am ---- binutils-2.14.90.0.5/bfd/doc.orig/Makefile.am 2003-07-23 09:08:09.000000000 -0600 -+++ binutils-2.14.90.0.5/bfd/doc/Makefile.am 2003-09-02 15:38:56.000000000 -0600 -@@ -55,10 +55,10 @@ - MKDOC = chew$(EXEEXT_FOR_BUILD) - - $(MKDOC): chew.o -- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) -+ $(CC_FOR_HOST) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) - - chew.o: chew.c -- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c -+ $(CC_FOR_HOST) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c - - protos: libbfd.h libcoff.h bfd.h - -diff -urN binutils-2.14.90.0.5/bfd/doc.orig/Makefile.in binutils-2.14.90.0.5/bfd/doc/Makefile.in ---- binutils-2.14.90.0.5/bfd/doc.orig/Makefile.in 2003-07-23 09:08:09.000000000 -0600 -+++ binutils-2.14.90.0.5/bfd/doc/Makefile.in 2003-09-02 15:39:11.000000000 -0600 -@@ -469,10 +469,10 @@ - - - $(MKDOC): chew.o -- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) -+ $(CC_FOR_HOST) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) - - chew.o: chew.c -- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c -+ $(CC_FOR_HOST) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c - - protos: libbfd.h libcoff.h bfd.h - -- cgit v1.2.3