Commit acde0d8c authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

toolchain: remove useless indirect variables 



The BR2_CONFIGURE_DEVEL_SYSROOT, BR2_CONFIGURE_STAGING_SYSROOT and
BR2_CONFIGURE_BUILD_TOOLS were used only in a few places, and it is in
fact clearer to just use their value in the various places they are
used.

The ultimate goal is to get rid of the toolchain/Makefile.in file.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ad5af757

package/binutils/binutils.mk

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ endif 
HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \

			--target=$(REAL_GNU_TARGET_NAME) \

			--disable-shared --enable-static \

			$(BR2_CONFIGURE_STAGING_SYSROOT) \

			--with-sysroot=$(STAGING_DIR) \

			$(BINUTILS_EXTRA_CONFIG_OPTIONS)



HOST_BINUTILS_DEPENDENCIES =

toolchain/Makefile.in

+0 −4
Original line number Diff line number Diff line 
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=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin



# gcc has a bunch of needed stuff....

include toolchain/gcc/Makefile.in

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

+4 −4
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched 
		--host=$(GNU_HOST_NAME) \

		--target=$(REAL_GNU_TARGET_NAME) \

		--enable-languages=c \

		$(BR2_CONFIGURE_DEVEL_SYSROOT) \

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

		--disable-__cxa_atexit \

		$(GCC_OPTSPACE) \

		$(GCC_QUADMATH) \
@@ -291,7 +291,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched 
		--host=$(GNU_HOST_NAME) \

		--target=$(REAL_GNU_TARGET_NAME) \

		--enable-languages=c \

		$(BR2_CONFIGURE_DEVEL_SYSROOT) \

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

		--disable-__cxa_atexit \

		$(GCC_OPTSPACE) \

		$(GCC_QUADMATH) \
@@ -369,8 +369,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) 
		--host=$(GNU_HOST_NAME) \

		--target=$(REAL_GNU_TARGET_NAME) \

		--enable-languages=$(GCC_CROSS_LANGUAGES) \

		$(BR2_CONFIGURE_STAGING_SYSROOT) \

		$(BR2_CONFIGURE_BUILD_TOOLS) \

		--with-sysroot=$(STAGING_DIR) \

		--with-build-time-tools=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin \

		--disable-__cxa_atexit \

		$(GCC_OPTSPACE) \

		$(GCC_QUADMATH) \