Ver código fonte

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.

"Steven J. Hill" 18 anos atrás
pai
commit
aadd9714b6
1 arquivos alterados com 6 adições e 1 exclusões
  1. 6 1
      toolchain/gcc/gcc-uclibc-3.x.mk

+ 6 - 1
toolchain/gcc/gcc-uclibc-3.x.mk

@@ -335,9 +335,14 @@ endif
 ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
 ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
 GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
 GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
 endif
 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)
 GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
 endif
 endif
+endif
 
 
 $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
 $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
 	PATH=$(TARGET_PATH) \
 	PATH=$(TARGET_PATH) \