diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-01-05 21:11:12 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-01-05 21:11:12 +0000 |
| commit | 84177fdaf9590e12ffd579e2a410acba1d5de7a9 (patch) | |
| tree | 5de6282a9c11b7751320060822bdd31255566b88 /misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk | |
| parent | d0bd9129b05b51021ea1539204586ccdec6c9b48 (diff) | |
| download | nuttx-84177fdaf9590e12ffd579e2a410acba1d5de7a9.tar.gz nuttx-84177fdaf9590e12ffd579e2a410acba1d5de7a9.tar.bz2 nuttx-84177fdaf9590e12ffd579e2a410acba1d5de7a9.zip | |
Add gcc 4.2.4
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1460 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk')
| -rw-r--r-- | misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk b/misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk index 2b42ff997..2a9a7faf8 100644 --- a/misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk +++ b/misc/buildroot/toolchain/gcc/gcc-nuttx-3.x.mk @@ -17,30 +17,30 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -ifeq ($(GCC_SNAP_DATE),) +# Without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk +ifneq ($(BR2_TOOLCHAIN_SYSROOT),y) + GCC_OFFICIAL_VER:=$(GCC_VERSION) GCC_SITE:=http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION) -#GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VER) -else -GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE) -GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VER) -endif GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER) GCC_CAT:=$(BZCAT) GCC_STRIP_HOST_BINARIES:=true - -ifeq ($(findstring 3.,$(GCC_VERSION)),3.) +ifeq ($(findstring x3.,x$(GCC_VERSION)),x3.) GCC_NO_MPFR:=y -endif +else +ifneq ($(BR2_INSTALL_FORTRAN),y) +# fortran needs gmp and mpfr ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.) GCC_NO_MPFR:=y endif -#ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.) -#GCC_NO_MPFR:=y -#endif +ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.) +GCC_NO_MPFR:=y +endif +endif +endif ############################################################# # @@ -62,7 +62,7 @@ ifeq ($(BR2_INSTALL_OBJC),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc endif -GCC_TARGET_PREREQ = +GCC_TARGET_PREREQ= GCC_STAGING_PREREQ= ifndef GCC_NO_MPFR @@ -106,15 +106,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) gcc-patched: $(GCC_DIR)/.patched $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # Apply any files named gcc-*.patch from the source directory to gcc -ifeq ($(GCC_SNAP_DATE),) - toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch -else -ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VER)),) - toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_OFFICIAL_VER) \*.patch -else toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch -endif -endif # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. @@ -435,3 +427,4 @@ gcc_target-clean: gcc_target-dirclean: rm -rf $(GCC_BUILD_DIR3) +endif |