From aadd9714b6eb183722a9209a3210457868bc2366 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 2 Dec 2006 05:15:27 +0000 Subject: [PATCH] For GCC 4.2 snapshots, we need to get the actual version from the BASE-VER file so that the target compiler will build and install properly. --- toolchain/gcc/gcc-uclibc-3.x.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 31c5d4b5fc..00471d71e6 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -335,9 +335,14 @@ endif ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) endif -ifeq ($(findstring 4.2.,$(GCC_VERSION)),4.2.) +ifeq ($(findstring 4.2,$(GCC_VERSION)),4.2) +ifneq ($(GCC_SNAP_DATE),) +REAL_GCC_VERSION:=`cat ${GCC_DIR}/gcc/BASE-VER` +GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(REAL_GCC_VERSION) +else GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) endif +endif $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled PATH=$(TARGET_PATH) \ -- 2.30.2