Commit 79cdd941 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain/gcc: fix target-gcc for 4.3.x 

Includes are in include-fixed and GCC_LIB_SUBDIR needs to be set like for
the rest of 4.x
parent 6d496c4e

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

+8 −3
Original line number Diff line number Diff line
@@ -484,6 +484,11 @@ else 
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)

endif

endif

GCC_INCLUDE_DIR:=include

ifeq ($(findstring 4.3,$(GCC_VERSION)),4.3)

GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)

GCC_INCLUDE_DIR:=include-fixed

endif



$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled

	PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \
@@ -514,10 +519,10 @@ endif 
	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc

	# Work around problem of missing syslimits.h

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

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

		echo "warning: working around missing syslimits.h"; \

		cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/include/syslimits.h \

			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \

		cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h \

			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/; \

	fi

	# Make sure we have 'cc'.

	if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \