X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Rules.mak;h=d04d4b9f207ec8547d168a7e9bdb0d33ccb21311;hb=5c9ed9f41afc6531daee5904673cf889c339ed3d;hp=80f273672ec8f8ebb7b439fb4be9e50675bbde87;hpb=08c358b604d9aa5087c0ec226a94cc8df7bd2952;p=oweals%2Fbusybox.git diff --git a/Rules.mak b/Rules.mak index 80f273672..d04d4b9f2 100644 --- a/Rules.mak +++ b/Rules.mak @@ -1,6 +1,6 @@ # Rules.make for busybox # -# Copyright (C) 2002 Erik Andersen +# Copyright (C) 1999-2004 by Erik Andersen # # 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 +19,7 @@ #-------------------------------------------------------- PROG := busybox -VERSION := 0.61.pre +VERSION := 1.00 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") @@ -36,31 +36,34 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") # your compiler is broken, you should not need to specify TARGET_ARCH CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) CC = $(CROSS)gcc -AR := $(CROSS)ar -AS := $(CROSS)as -LD := $(CROSS)ld -NM := $(CROSS)nm -STRIP := $(CROSS)strip -CPP := $(CC) -E -MAKEFILES := $(TOPDIR).config +AR = $(CROSS)ar +AS = $(CROSS)as +LD = $(CROSS)ld +NM = $(CROSS)nm +STRIP = $(CROSS)strip +CPP = $(CC) -E +# MAKEFILES = $(top_builddir)/.config # What OS are you compiling busybox for? This allows you to include # OS specific things, syscall overrides, etc. -TARGET_OS:=linux +TARGET_OS=linux # Select the compiler needed to build binaries for your development system -HOSTCC := gcc -HOSTCFLAGS:= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer +HOSTCC = gcc +HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer + +# 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))) - + # If you have a "pristine" source directory, point BB_SRC_DIR to it. # Experimental and incomplete; tell the mailing list # if you do or don't like it so far. -BB_SRC_DIR:= +BB_SRC_DIR= # To compile vs some other alternative libc, you may need to use/adjust # the following lines to meet your needs... @@ -70,19 +73,15 @@ BB_SRC_DIR:= # using the compatible RPMs (compat-*) at http://www.redhat.com ! #LIBCDIR:=/usr/i386-glibc20-linux # -# The following is used for libc5 (if you install altgcc and libc5-altdev -# on a Debian system). -#LIBCDIR:=/usr/i486-linuxlibc1 -# -# For other libraries, you are on your own... +# 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) #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") -WARNINGS:=-Wall -Wstrict-prototypes -Wshadow -CFLAGS:=-I$(TOPDIR)include -ARFLAGS:=-r +WARNINGS=-Wall -Wstrict-prototypes -Wshadow +CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) +ARFLAGS=-r #-------------------------------------------------------- export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP @@ -101,10 +100,9 @@ TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ ) endif -# Pull in the user's uClibc configuration +# Pull in the user's busybox configuration ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -include_config := 1 --include $(TOPDIR).config +-include $(top_builddir)/.config endif # A nifty macro to make testing gcc features easier @@ -117,20 +115,20 @@ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; # for OPTIMIZATION... # use '-Os' optimization if available, else use -O2 -OPTIMIZATION:= -OPTIMIZATION+=${call check_gcc,-Os,-O2} +OPTIMIZATION= +OPTIMIZATION=${call check_gcc,-Os,-O2} # Some nice architecture specific optimizations ifeq ($(strip $(TARGET_ARCH)),arm) OPTIMIZATION+=-fstrict-aliasing endif ifeq ($(strip $(TARGET_ARCH)),i386) - OPTIMIZATION+=-march=i386 + OPTIMIZATION+=$(call check_gcc,-march=i386,) OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,) OPTIMIZATION+=$(call check_gcc,-falign-functions=0 -falign-jumps=0 -falign-loops=0,\ -malign-functions=0 -malign-jumps=0 -malign-loops=0) endif -OPTIMIZATIONS:=$(OPTIMIZATION) -fomit-frame-pointer +OPTIMIZATIONS=$(OPTIMIZATION) -fomit-frame-pointer # #-------------------------------------------------------- @@ -139,31 +137,31 @@ OPTIMIZATIONS:=$(OPTIMIZATION) -fomit-frame-pointer # by itself, instead of following it by the same half-dozen overrides # every time. The stuff below, on the other hand, is probably less # prone to casual user adjustment. -# +# -ifeq ($(strip $(DOLFS)),y) +ifeq ($(strip $(CONFIG_LFS)),y) # For large file summit support CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif -ifeq ($(strip $(DODMALLOC)),y) +ifeq ($(strip $(CONFIG_DMALLOC)),y) # For testing mem leaks with dmalloc CFLAGS+=-DDMALLOC LIBRARIES:=-ldmalloc else - ifeq ($(strip $(DOEFENCE)),y) + ifeq ($(strip $(CONFIG_EFENCE)),y) LIBRARIES:=-lefence endif endif -ifeq ($(strip $(DODEBUG)),y) +ifeq ($(strip $(CONFIG_DEBUG)),y) CFLAGS +=$(WARNINGS) -g -D_GNU_SOURCE LDFLAGS +=-Wl,-warn-common STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging else - CFLAGS += $(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE + CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG LDFLAGS += -s -Wl,-warn-common STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment endif -ifeq ($(strip $(DOSTATIC)),y) +ifeq ($(strip $(CONFIG_STATIC)),y) LDFLAGS += --static endif @@ -191,23 +189,8 @@ endif # have a chance of winning. CFLAGS += $(CFLAGS_EXTRA) -%.o: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< - -ifdef _FASTDEP_ALL_SUB_DIRS -fastdep: dummy - $(TOPDIR)scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS_nostdinc) -- $(wildcard *.[chS]) > .depend -ifdef ALL_SUB_DIRS - $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" -endif - -$(patsubst %,_sfdep_%,$(_FASTDEP_ALL_SUB_DIRS)): - $(MAKE) -C $(patsubst _sfdep_%,%,$@) fastdep -endif - .PHONY: dummy - .EXPORT_ALL_VARIABLES: