Remove USE_LINUX_UCLIBC option, since that is now the only (ef407d3d) · Commits · Dom Sekotill / buildroot

Makefile

+6 −37

Original line number	Diff line number	Diff line
		# Makefile for a simple busybox/uClibc root filesystem
		#
		# Copyright (C) 2001-2003 Erik Andersen <andersen@codepoet.org>
		# Copyright (C) 2001-2004 Erik Andersen <andersen@codepoet.org>
		# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
		#
		# This program is free software; you can redistribute it and/or modify
		@@ -45,19 +45,11 @@ ARCH:=i386
		#ARCH:=sparc
		#ARCH:=whatever

		# Enable this if you want to use an <arch>-linux-uclibc-* toolchain.
		# Note that, to avoid configure problems with apps that don't support
		# this tupple, we also put <arch>-linux-* symlinks in staging_dir/bin.
		# This is the preferred approach now.
		USE_LINUX_UCLIBC:=true

		# If you are building a native gcc toolchain, do you want to
		# build the old gcc-2.95 based toolchain, or would you prefer
		# a nice and shiny new gcc-3.3.2 toolchain?
		# WARNING -- 2.95 currently does not build unless USE_LINUX_UCLIBC:=true.
		# WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
		# WARNING -- 2.95 does not currently build natively for the target.
		#GCC_2_95_TOOLCHAIN:=true
		GCC_2_95_TOOLCHAIN:=false

		# Enable this to use the uClibc daily snapshot instead of a released
		@@ -77,17 +69,11 @@ BUILD_WITH_LARGEFILE:=true
		WGET:=wget --passive-ftp

		# Optimize toolchain for which type of CPU?
		ifeq ($(USE_LINUX_UCLIBC),true)
		OPTIMIZE_FOR_CPU=$(ARCH)
		#OPTIMIZE_FOR_CPU=i686
		# Note... gcc 2.95 does not seem to like anything higher than i586.
		#OPTIMIZE_FOR_CPU=i586
		#OPTIMIZE_FOR_CPU=whatever
		else
		# WARNING!!! CURRENTLY BROKEN!!! LEAVE IT AS $(ARCH)!!!
		OPTIMIZE_FOR_CPU=$(ARCH)
		# WARNING!!! CURRENTLY BROKEN!!! LEAVE IT AS $(ARCH)!!!
		endif

		# Soft floating point options.
		# Notes:
		@@ -223,14 +209,6 @@ TARGET_SOFT_FLOAT:=
		ARCH_FPU_SUFFIX:=
		endif

		# The new stuff auto-detects approrpriate locale support.
		# So only set this for the old 'hacked' toolchain.
		ifneq ($(USE_LINUX_UCLIBC),true)
		ifeq ($(ENABLE_LOCALE),true)
		EXTRA_GCC_CONFIG_OPTIONS += --enable-clocale=gnu
		endif
		endif

		# WARNING -- uClibc currently disables large file support on cris.
		ifeq ("$(strip $(ARCH))","cris")
		BUILD_WITH_LARGEFILE:=false
		@@ -252,19 +230,10 @@ STAGING_DIR=$(BUILD_DIR)/staging_dir
		TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)
		TARGET_PATH=$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
		IMAGE:=$(BASE_DIR)/root_fs_$(ARCH)$(ARCH_FPU_SUFFIX)

		ifeq ($(USE_LINUX_UCLIBC),true)
		REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
		GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
		KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
		TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
		else
		REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
		GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
		KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-
		TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-
		endif

		TARGET_CC=$(TARGET_CROSS)gcc
		STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note

make/binutils-uclibc.mk

+0 −2

Original line number	Diff line number	Diff line
		ifeq ($(USE_LINUX_UCLIBC),true)
		#############################################################
		#
		# build binutils for use on the host system
		@@ -102,4 +101,3 @@ binutils_target-clean:
		binutils_target-dirclean:
		rm -rf $(BINUTILS_DIR2)

		endif #ifeq ($(USE_LINUX_UCLIBC),true)

make/gcc-uclibc-2.95.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

		ifeq ($(USE_LINUX_UCLIBC),true)
		ifeq ($(GCC_2_95_TOOLCHAIN),true)

		GCC_SITE:=http://www.uclibc.org/downloads/toolchain
		@@ -271,4 +270,3 @@ gcc2_95_target-dirclean:
		rm -rf $(GCC_BUILD_DIR3)

		endif
		endif #ifeq ($(USE_LINUX_UCLIBC),true)

make/gcc-uclibc-3.3.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

		ifeq ($(USE_LINUX_UCLIBC),true)
		ifneq ($(GCC_2_95_TOOLCHAIN),true)

		# Shiny new stuff...
		@@ -255,4 +254,3 @@ gcc3_3_target-dirclean:
		rm -rf $(GCC_BUILD_DIR3)

		endif
		endif #ifeq ($(USE_LINUX_UCLIBC),true)