Kristian Hoffmann writes:

TARGET_LANGUAGES wasn't being set correctly if you enable GCJ or C++ in
the buildroot config.  It looks like INSTALL_LIBSTDCPP and INSTALL_LIBGCJ
were renamed to BR2_INSTALL_... in the config system, but not in the gcc
and ccache makefiles.

-Kristian

diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index b36f27e2c4c6c0067e24be43608a8941506d8691..60e99c6d134d5f6db13917a6da9ded15ed368650 100644 (file)
--- 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 752519655ae9fd62c5c4856485847f58a1e715ab..01401e1601c41a9fd55e0e21e8b1f832d28b95ee 100644 (file)
--- 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 fa6e0869ff8a90117e5e9541868a033335b4f175..327a0d9a44331099aa465e449828373009844800 100644 (file)
--- 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 817c38245c47d680b9d61507e92b4722f8cbdc43..1c44e66cd567afc17e18d5d0022c0c9f0f34ee53 100644 (file)
--- 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