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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 8632d675560948ddbb5c746569ac185da302982e..0a5a948a9c1aed9827875f301d060faeb1284966 100644 (file)
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -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 =

diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index a7ca5589e4687d835983bc6953ba843b09f8086e..5f32f822b62157a77616261434b97f8e3f2d2bb6 100644 (file)
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -1,6 +1,2 @@
-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

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index ae734e88ba01df312fc236bfe53376ec58b6129c..7cdba0e70ffb754efdafc1f7c2a3b77c5eded75e 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -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) \