diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-26 21:12:38 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-26 21:12:38 +0000 |
| commit | 4b0d5a80f8b38bf9a264584ffc90b901f82c8cbb (patch) | |
| tree | 56762054e7ac277378262dd98c4ff8c9c55a7d1e /toolchain/gcc/gcc-uclibc-4.x.mk | |
| parent | 02f18650097aed6c71f704c38c4dc55039286248 (diff) | |
- revert some bad checkins, fixup bad settings in atmel targets and move the gcc target abi back to a place where the other arch-specific settings live
Diffstat (limited to 'toolchain/gcc/gcc-uclibc-4.x.mk')
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 7b6ceb032..59b9a7e07 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -30,13 +30,14 @@ GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VER) endif # redefine if using an external prepatched gcc source -ifeq ($(BR2_TOOLCHAIN_NORMAL),) +ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y) GCC_SITE:=$(VENDOR_SITE) GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE) -endif +GCC_PATCH_DIR:=$(VENDOR_PATCH_DIR)/gcc-$(GCC_OFFICIAL_VER) +endif #!BR2_TOOLCHAIN_BUILDROOT # define patch location -ifeq ($(BR2_TOOLCHAIN_NORMAL),y) # Normal toolchain +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # Normal toolchain ifeq ($(GCC_SNAP_DATE),) # Not a snapshot GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) else # Is a snapshot @@ -47,9 +48,7 @@ else # Normal patch to snapshot GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) endif # Snapshot patch endif # Not a snapshot -else # Prepatched toolchain -GCC_PATCH_DIR:=$(VENDOR_PATCH_DIR)/gcc-$(GCC_OFFICIAL_VER) -endif # Normal toolchain +endif # BR2_TOOLCHAIN_BUILDROOT GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER) |