diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index b36f27e2c4..60e99c6d13 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -62,7 +62,7 @@ $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
 		ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
 		ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
 		ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
-ifeq ($(INSTALL_LIBSTDCPP),true)
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 	[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
 		mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
 	[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index 752519655a..01401e1601 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -21,11 +21,6 @@ TARGET_SOFT_FLOAT:=
 ARCH_FPU_SUFFIX:=
 endif
 
-ifeq ($(INSTALL_LIBGCJ),true)
-INSTALL_LIBSTDCPP:=true
-endif
-
-
 ifeq ($(strip $(BR2_PACKAGE_GCC_TARGET)),y)
 TARGETS+=gcc_target
 endif
diff --git a/toolchain/gcc/gcc-uclibc-2.95.mk b/toolchain/gcc/gcc-uclibc-2.95.mk
index fa6e0869ff..327a0d9a44 100644
--- a/toolchain/gcc/gcc-uclibc-2.95.mk
+++ b/toolchain/gcc/gcc-uclibc-2.95.mk
@@ -36,7 +36,7 @@ GCC_STRIP_HOST_BINARIES:=true
 #
 #############################################################
 
-ifeq ($(INSTALL_LIBSTDCPP),true)
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 TARGET_LANGUAGES:=c,c++
 STLPORT_TARGET=stlport
 else
diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index 817c38245c..1c44e66cd5 100644
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -39,10 +39,10 @@ GCC_STRIP_HOST_BINARIES:=true
 #
 #############################################################
 
-ifeq ($(INSTALL_LIBGCJ),true)
+ifeq ($(BR2_INSTALL_LIBGCJ),y)
 TARGET_LANGUAGES:=c,c++,java
 else
-ifeq ($(INSTALL_LIBSTDCPP),true)
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 TARGET_LANGUAGES:=c,c++
 else
 TARGET_LANGUAGES:=c