diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/binutils-uclibc.mk | 4 | ||||
| -rw-r--r-- | make/gcc-uclibc-2.95.mk | 7 | ||||
| -rw-r--r-- | make/gcc-uclibc-3.3.mk | 9 | ||||
| -rw-r--r-- | make/uclibc.mk | 9 |
4 files changed, 17 insertions, 12 deletions
diff --git a/make/binutils-uclibc.mk b/make/binutils-uclibc.mk index 38318b887..955f5db2e 100644 --- a/make/binutils-uclibc.mk +++ b/make/binutils-uclibc.mk @@ -4,8 +4,8 @@ # ############################################################# BINUTILS_SITE:=http://ftp.kernel.org/pub/linux/devel/binutils -BINUTILS_SOURCE:=binutils-2.14.90.0.6.tar.bz2 -BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14.90.0.6 +BINUTILS_SOURCE:=binutils-2.14.90.0.8.tar.bz2 +BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14.90.0.8 BINUTILS_CAT:=bzcat BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-build diff --git a/make/gcc-uclibc-2.95.mk b/make/gcc-uclibc-2.95.mk index a86809613..65a2e4e60 100644 --- a/make/gcc-uclibc-2.95.mk +++ b/make/gcc-uclibc-2.95.mk @@ -1,6 +1,7 @@ # Makefile for to build a gcc/uClibc toolchain # # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -75,7 +76,8 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched mkdir -p $(GCC_BUILD_DIR1) -mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include - -(cd $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) ; ln -sf include sys-include) + # Important! Required for limits.h to be fixed. + ln -sf include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \ $(GCC_DIR)/configure \ --prefix=$(STAGING_DIR) \ @@ -85,7 +87,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched --enable-languages=c \ --disable-shared \ --includedir=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include \ - --with-headers \ + --with-headers=$(TOOL_BUILD_DIR)/uClibc_dev/usr/include \ --disable-__cxa_atexit \ --enable-target-optspace \ --with-gnu-ld \ @@ -166,7 +168,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/$(REAL_GNU_TAR --enable-languages=$(TARGET_LANGUAGES) \ --enable-shared \ --with-gxx-include-dir=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include/c++ \ - --with-headers \ --disable-__cxa_atexit \ --enable-target-optspace \ --with-gnu-ld \ diff --git a/make/gcc-uclibc-3.3.mk b/make/gcc-uclibc-3.3.mk index 93c92318b..c9cac518c 100644 --- a/make/gcc-uclibc-3.3.mk +++ b/make/gcc-uclibc-3.3.mk @@ -1,6 +1,7 @@ # Makefile for to build a gcc/uClibc toolchain # # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +20,7 @@ ifneq ($(GCC_2_95_TOOLCHAIN),true) # Shiny new stuff... -GCC_VERSION:=3.3.2 +GCC_VERSION:=3.3.3 #GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION) #GCC_SITE:=http://www.binarycode.org/gcc/releases/gcc-$(GCC_VERSION) GCC_SITE:=http://gcc.get-software.com/releases/gcc-$(GCC_VERSION) @@ -79,7 +80,6 @@ endif $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched mkdir -p $(GCC_BUILD_DIR1) -mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include - -(cd $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) ; ln -sf include sys-include) (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \ $(GCC_DIR)/configure \ --prefix=$(STAGING_DIR) \ @@ -89,7 +89,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched --enable-languages=c \ --disable-shared \ --includedir=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include \ - --with-headers \ + --with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ \ --disable-__cxa_atexit \ --enable-target-optspace \ --with-gnu-ld \ @@ -126,6 +126,8 @@ gcc3_3_initial-dirclean: GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-3.3-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a mkdir -p $(GCC_BUILD_DIR2) + # Important! Required for limits.h to be fixed. + ln -sf include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include (cd $(GCC_BUILD_DIR2); PATH=$(TARGET_PATH) \ $(GCC_DIR)/configure \ --prefix=$(STAGING_DIR) \ @@ -135,7 +137,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/$(REAL_GNU_TAR --enable-languages=$(TARGET_LANGUAGES) \ --enable-shared \ --with-gxx-include-dir=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include/c++ \ - --with-headers \ --disable-__cxa_atexit \ --enable-target-optspace \ --with-gnu-ld \ diff --git a/make/uclibc.mk b/make/uclibc.mk index 4d138ffe4..ebe90591d 100644 --- a/make/uclibc.mk +++ b/make/uclibc.mk @@ -73,10 +73,13 @@ endif ifeq ($(strip $(SOFT_FLOAT)),true) $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config endif + mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include + mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib + mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib $(MAKE) -C $(UCLIBC_DIR) \ - PREFIX=$(STAGING_DIR)/ \ - DEVEL_PREFIX=$(REAL_GNU_TARGET_NAME)/ \ - RUNTIME_PREFIX=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/ \ + PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ pregen install_dev; touch $(UCLIBC_DIR)/.configured |