[uClibc] PATCH: Fixes TARGET_LANGUAGES not being set correctly
Kristian Hoffmann
khoff at fire2wire.com
Tue Oct 19 00:21:55 UTC 2004
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
--- buildroot/toolchain/ccache/ccache.mk 2004-10-11 07:01:03.000000000 -0700
+++ buildroot_stock/toolchain/ccache/ccache.mk 2004-10-18 13:04:17.000000000 -0700
@@ -62,7 +62,7 @@
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),true)
[ -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++ ] && \
--- buildroot/toolchain/gcc/Makefile.in 2004-10-09 14:28:56.000000000 -0700
+++ buildroot_stock/toolchain/gcc/Makefile.in 2004-10-18 13:15:21.000000000 -0700
@@ -21,8 +21,8 @@
ARCH_FPU_SUFFIX:=
endif
-ifeq ($(INSTALL_LIBGCJ),true)
-INSTALL_LIBSTDCPP:=true
+ifeq ($(BR2_INSTALL_LIBGCJ),y)
+BR2_INSTALL_LIBSTDCPP:=y
endif
--- buildroot/toolchain/gcc/gcc-uclibc-2.95.mk 2004-10-11 07:01:04.000000000 -0700
+++ buildroot_stock/toolchain/gcc/gcc-uclibc-2.95.mk 2004-10-18 13:15:27.000000000 -0700
@@ -36,7 +36,7 @@
#
#############################################################
-ifeq ($(INSTALL_LIBSTDCPP),true)
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
TARGET_LANGUAGES:=c,c++
STLPORT_TARGET=stlport
else
--- buildroot/toolchain/gcc/gcc-uclibc-3.x.mk 2004-10-11 07:01:04.000000000 -0700
+++ buildroot_stock/toolchain/gcc/gcc-uclibc-3.x.mk 2004-10-18 13:15:31.000000000 -0700
@@ -39,10 +39,10 @@
#
#############################################################
-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
More information about the uClibc
mailing list