[toolchain] gcj can only be built safely on gcc >= 4.3

[openwrt.git] / toolchain / gcc / common.mk

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 5420727..645cf60 100644 (file)
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -72,6 +72,9 @@ else
   ifeq ($(PKG_VERSION),4.5.0)
   PKG_MD5SUM:=ff27b7c4a5d5060c8a8543a44abca31f
   endif
   ifeq ($(PKG_VERSION),4.5.0)
   PKG_MD5SUM:=ff27b7c4a5d5060c8a8543a44abca31f
   endif

+  ifeq ($(PKG_VERSION),4.5.1)
+  PKG_MD5SUM:=48231a8e33ed6e058a341c53b819de1a
+  endif

 endif
 
 PATCH_DIR=../patches/$(GCC_VERSION)
 endif
 
 PATCH_DIR=../patches/$(GCC_VERSION)


@@ -101,7 +104,7 @@ export libgcc_cv_fixed_point=no
 GCC_CONFIGURE:= \
        SHELL="$(BASH)" \
        $(HOST_SOURCE_DIR)/configure \
 GCC_CONFIGURE:= \
        SHELL="$(BASH)" \
        $(HOST_SOURCE_DIR)/configure \

-               --prefix=$(TOOLCHAIN_DIR)/usr \
+               --prefix=$(TOOLCHAIN_DIR) \

                --build=$(GNU_HOST_NAME) \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \


@@ -184,7 +187,7 @@ define Host/Clean
                $(STAGING_DIR_HOST)/stamp/.binutils_* \
                $(GCC_BUILD_DIR) \
                $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
                $(STAGING_DIR_HOST)/stamp/.binutils_* \
                $(GCC_BUILD_DIR) \
                $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \

-               $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME) \
-               $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gc* \
-               $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c*
+               $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME) \
+               $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gc* \
+               $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c*

 endef
 endef