Commit dbfd77f6 authored by Eric Andersen's avatar Eric Andersen
Browse files

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
parent 8500fcd5

toolchain/ccache/ccache.mk

+1 −1
Original line number Diff line number Diff line
@@ -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++ ] && \

toolchain/gcc/Makefile.in

+0 −5
Original line number Diff line number Diff line
@@ -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

toolchain/gcc/gcc-uclibc-2.95.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

toolchain/gcc/gcc-uclibc-3.x.mk

+2 −2
Original line number Diff line number Diff line
@@ -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