Commit 454b70d0 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

target-g++: fix build 



Just as we did to fix target-gcc, pass CXX_FOR_TARGET when building
target g++, and remove useless copies of g++ and c++.

Tested on ARM by compiling a simple C++ program using <iostream> on
the target and running it.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fed6a2a6

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

+4 −1
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared 
		BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \

		GCC_FOR_TARGET="$(TARGET_CC)" \

		CC_FOR_TARGET="$(TARGET_CC)" \

		CXX_FOR_TARGET="$(TARGET_CXX)" \

		$(GCC_SRC_DIR)/configure $(QUIET) \

		--prefix=/usr \

		--build=$(GNU_HOST_NAME) \
@@ -445,8 +446,10 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled 
	# Remove broken specs file (cross compile flag is set).

	rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs



	# Remove useless copies of gcc

	# Remove useless copies of gcc, c++, g++

	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc*

	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++*

	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++*



	# Work around problem of missing syslimits.h

	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \