summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-04-17 04:45:26 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-04-25 06:55:56 (GMT)
commitacde0d8c526214502f43cb8b0e4c3f955a1297f3 (patch)
treebdb71ce39fac8fa173a934099ad44179fc7a18e1
parentad5af7573291e48835d52223642505a2f8d18af2 (diff)
downloadbuildroot-acde0d8c526214502f43cb8b0e4c3f955a1297f3.tar.gz
buildroot-acde0d8c526214502f43cb8b0e4c3f955a1297f3.tar.bz2
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>
-rw-r--r--package/binutils/binutils.mk2
-rw-r--r--toolchain/Makefile.in4
-rw-r--r--toolchain/gcc/gcc-uclibc-4.x.mk8
3 files changed, 5 insertions, 9 deletions
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 8632d67..0a5a948 100644
--- 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 a7ca558..5f32f82 100644
--- 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 ae734e8..7cdba0e 100644
--- 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) \