From 1fa4a9448b4909fb6baf9953c14760f588b680bc Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 22 Jun 2006 22:05:00 +0000 Subject: [PATCH] Patch from Shaun Jackman to replace CFLAGS_EXTRA with .config.mak --- Config.in | 9 --------- Rules.mak | 22 +--------------------- TODO | 2 +- include/platform.h | 2 +- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/Config.in b/Config.in index eaa10b42e..b664508f6 100644 --- a/Config.in +++ b/Config.in @@ -307,15 +307,6 @@ config CROSS_COMPILER_PREFIX then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here, which will ensure the correct compiler is used. -config EXTRA_CFLAGS_OPTIONS - string "Any extra CFLAGS options for the compiler?" - default "" - help - Do you want to pass any extra CFLAGS options to the compiler as - you build BusyBox? If so, this is the option for you... For example, - if you want to add some simple compiler switches (like -march=i686), - or check for warnings using -Werror, just those options here. - config CONFIG_BUILD_AT_ONCE bool "Compile all sources at once" default n diff --git a/Rules.mak b/Rules.mak index 2f34bfbd2..310797d8a 100644 --- a/Rules.mak +++ b/Rules.mak @@ -52,26 +52,6 @@ TARGET_OS=linux # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL:= C -# If you want to add some simple compiler switches (like -march=i686), -# especially from the command line, use this instead of CFLAGS directly. -# For optimization overrides, it's better still to set OPTIMIZATION. -CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) -# be gentle to vi coloring.. ") - -# To compile vs some other alternative libc, you may need to use/adjust -# the following lines to meet your needs... -# -# If you are using Red Hat 6.x with the compatible RPMs (for developing under -# Red Hat 5.x and glibc 2.0) uncomment the following. Be sure to read about -# using the compatible RPMs (compat-*) at http://www.redhat.com ! -#LIBCDIR:=/usr/i386-glibc20-linux -# -# For other libraries, you are on your own. But these may (or may not) help... -#LDFLAGS+=-nostdlib -#LIBRARIES:=$(LIBCDIR)/lib/libc.a -lgcc -#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR) -funsigned-char -#GCCINCDIR:=$(shell gcc -print-search-dirs | $(SED) -ne "s/install: \(.*\)/\1include/gp") - # This must bind late because srcdir is reset for every source subdirectory. INCS:=-I$(top_builddir)/include -I$(top_srcdir)/include CFLAGS=$(INCS) -I$(srcdir) -D_GNU_SOURCE @@ -343,7 +323,7 @@ endif # Put user-supplied flags at the end, where they # have a chance of winning. -CFLAGS += $(CFLAGS_EXTRA) +-include $(top_builddir)/.config.mak #------------------------------------------------------------ # Installation options diff --git a/TODO b/TODO index d4ffbc451..edae61cd1 100644 --- a/TODO +++ b/TODO @@ -179,7 +179,7 @@ Memory Allocation allocation on the stack or the heap. Unfortunately, we're not using it much. We need to audit our memory allocations and turn a lot of malloc/free calls into RESERVE_CONFIG_BUFFER/RELEASE_CONFIG_BUFFER. - For a start, see e.g. make CFLAGS_EXTRA=-Wlarger-than-64 + For a start, see e.g. make EXTRA_CFLAGS=-Wlarger-than-64 And while we're at it, many of the CONFIG_FEATURE_CLEAN_UP #ifdefs will be optimized out by the compiler in the stack allocation case (since there's no diff --git a/include/platform.h b/include/platform.h index f23d1fb0b..636c1a56c 100644 --- a/include/platform.h +++ b/include/platform.h @@ -174,7 +174,7 @@ typedef unsigned long long int uintmax_t; /* uclibc does not implement daemon for no-mmu systems. * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably. * For earlier versions there is no reliable way to check if we are building - * for a mmu-less system; the user should pass CFLAGS_EXTRA="-DBB_NOMMU" + * for a mmu-less system; the user should pass EXTRA_CFLAGS="-DBB_NOMMU" * on his own. */ #if defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \ -- 2.25.1