Commit 91f8edad authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'avr32-toolchain-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 18fa12fe 460ba963

toolchain/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ else 
MULTILIB:=--disable-multilib

endif



BR2_SYSROOT_STAGING_DESTDIR=DESTDIR=$(STAGING_DIR)/

BR2_SYSROOT_TARGET_DESTDIR=DESTDIR=$(TARGET_DIR)/

BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/

BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR)

BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin

toolchain/binutils/binutils.mk

+2 −4
Original line number Diff line number Diff line
@@ -67,12 +67,10 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched 
	(cd $(BINUTILS_DIR1); rm -rf config.cache; \

		$(HOST_CONFIGURE_OPTS) \

		$(BINUTILS_DIR)/configure $(QUIET) \

		--prefix=/usr \

		--prefix=$(STAGING_DIR)/usr \

		--build=$(GNU_HOST_NAME) \

		--host=$(GNU_HOST_NAME) \

		--target=$(REAL_GNU_TARGET_NAME) \

		--mandir=/usr/share/man \

		--infodir=/usr/share/info \

		$(BR2_CONFIGURE_DEVEL_SYSROOT) \

		$(BR2_CONFIGURE_STAGING_SYSROOT) \

		$(DISABLE_NLS) \
@@ -90,7 +88,7 @@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured 
# Make install will put gettext data in staging_dir/share/locale.

# Unfortunatey, it isn't configureable.

$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump

	$(MAKE) -C $(BINUTILS_DIR1) $(BR2_SYSROOT_STAGING_DESTDIR) install

	$(MAKE) -C $(BINUTILS_DIR1) install

	#	tooldir=/usr build_tooldir=/usr install

	#rm -f $(STAGING_DIR)/usr/bin/{ar,as,ld,nm,objdump,ranlib,strip}

toolchain/gcc/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ endif 
ifeq ($(BR2_avr32),y)

EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap

SOFT_FLOAT_CONFIG_OPTION:=

EXTRA_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \

#EXTRA_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as

endif



ifeq ($(BR2_PACKAGE_GCC_TARGET),y)

toolchain/gcc/gcc-uclibc-4.x.mk

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) 
	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \

		$(HOST_CONFIGURE_OPTS) \

		$(GCC_SRC_DIR)/configure $(QUIET) \

		--prefix=/usr \

		--prefix=$(STAGING_DIR)/usr \

		--build=$(GNU_HOST_NAME) \

		--host=$(GNU_HOST_NAME) \

		--target=$(REAL_GNU_TARGET_NAME) \
@@ -302,7 +302,7 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured 
	touch $@



$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled

	PATH=$(TARGET_PATH) $(MAKE) $(BR2_SYSROOT_STAGING_DESTDIR) \

	PATH=$(TARGET_PATH) $(MAKE) \

		-C $(GCC_BUILD_DIR2) install

	if [ -d "$(STAGING_DIR)/lib64" ]; then \

		if [ ! -e "$(STAGING_DIR)/lib" ]; then \