From 2ae84ac85ff72a861e8c276ba4e650e1e9ba7982 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Jul 2010 15:42:27 +0200 Subject: binutils,gcc: use correct --prefix The cross binutils and cross gcc are actually going to be executed from $(STAGING_DIR)/usr, so the correct prefix is $(STAGING_DIR)/usr and not /usr. This also fixes what is known as the "AVR32 toolchain build failure", which was due to the fact that the prefix directory wasn't writable (since it was /usr). Signed-off-by: Thomas Petazzoni --- toolchain/binutils/binutils.mk | 6 ++---- toolchain/gcc/gcc-uclibc-4.x.mk | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 68ac3e98e..93dbbb007 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -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} diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 6e767ac77..0a538dec0 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -266,7 +266,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) \ @@ -299,7 +299,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 \ -- cgit v1.2.3 From c7f180eca5eb35f2973cf0c89e1d047e090e02af Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Jul 2010 15:43:37 +0200 Subject: toolchain: Remove now-unused variables The variable BR2_SYSROOT_STAGING_DESTDIR is no longer used, since now the prefix for gcc is already set to the correct location. The variable BR2_SYSROOT_TARGET_DESTDIR was already unused. Signed-off-by: Thomas Petazzoni --- toolchain/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in index e5fae1f56..d1af87747 100644 --- a/toolchain/Makefile.in +++ b/toolchain/Makefile.in @@ -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 -- cgit v1.2.3 From 460ba963acb17df043f412e5c01fda250da6b410 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Jul 2010 15:44:36 +0200 Subject: toolchain: remove redundant and incorrect --with-build-time-tools option This option is already part of the gcc configure options through the BR2_CONFIGURE_BUILD_TOOLS variable (in toolchain/Makefile.in). Additionnally, the value that was passed in the AVR32 specific case was incorrect: it was $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin instead of $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin. Signed-off-by: Thomas Petazzoni --- toolchain/gcc/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index 4278bdbcf..9537e9dc7 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -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) -- cgit v1.2.3