make certain values specified in the environment always win
This commit is contained in:
parent
f4fd3a1331
commit
b8b6816f7b
24
Rules.mak
24
Rules.mak
@ -34,23 +34,23 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
|
|||||||
# to something more interesting... Target architecture is determined
|
# to something more interesting... Target architecture is determined
|
||||||
# by asking the CC compiler what arch it compiles things for, so unless
|
# by asking the CC compiler what arch it compiles things for, so unless
|
||||||
# your compiler is broken, you should not need to specify TARGET_ARCH
|
# your compiler is broken, you should not need to specify TARGET_ARCH
|
||||||
CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
|
CROSS ?=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
|
||||||
#CROSS =/usr/i386-linux-uclibc/bin/i386-uclibc-
|
#CROSS =/usr/i386-linux-uclibc/bin/i386-uclibc-
|
||||||
CC = $(CROSS)gcc
|
CC ?= $(CROSS)gcc
|
||||||
AR = $(CROSS)ar
|
AR ?= $(CROSS)ar
|
||||||
AS = $(CROSS)as
|
AS ?= $(CROSS)as
|
||||||
LD = $(CROSS)ld
|
LD ?= $(CROSS)ld
|
||||||
NM = $(CROSS)nm
|
NM ?= $(CROSS)nm
|
||||||
STRIP = $(CROSS)strip
|
STRIP ?= $(CROSS)strip
|
||||||
CPP = $(CC) -E
|
CPP ?= $(CC) -E
|
||||||
MAKEFILES = $(TOPDIR).config
|
MAKEFILES = $(TOPDIR).config
|
||||||
|
|
||||||
# What OS are you compiling busybox for? This allows you to include
|
# What OS are you compiling busybox for? This allows you to include
|
||||||
# OS specific things, syscall overrides, etc.
|
# OS specific things, syscall overrides, etc.
|
||||||
TARGET_OS=linux
|
TARGET_OS?=linux
|
||||||
|
|
||||||
# Select the compiler needed to build binaries for your development system
|
# Select the compiler needed to build binaries for your development system
|
||||||
HOSTCC = gcc
|
HOSTCC ?= gcc
|
||||||
HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
|
HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||||
|
|
||||||
# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
|
# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
|
||||||
@ -86,8 +86,7 @@ ARFLAGS=-r
|
|||||||
|
|
||||||
#--------------------------------------------------------
|
#--------------------------------------------------------
|
||||||
export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
|
export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
|
||||||
ifeq ($(strip $(TARGET_ARCH)),)
|
TARGET_ARCH?=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
|
||||||
TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
|
|
||||||
-e 's/i.86/i386/' \
|
-e 's/i.86/i386/' \
|
||||||
-e 's/sparc.*/sparc/' \
|
-e 's/sparc.*/sparc/' \
|
||||||
-e 's/arm.*/arm/g' \
|
-e 's/arm.*/arm/g' \
|
||||||
@ -99,7 +98,6 @@ TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
|
|||||||
-e 's/mipsel-.*/mipsel/' \
|
-e 's/mipsel-.*/mipsel/' \
|
||||||
-e 's/cris.*/cris/' \
|
-e 's/cris.*/cris/' \
|
||||||
)
|
)
|
||||||
endif
|
|
||||||
|
|
||||||
# Pull in the user's busybox configuration
|
# Pull in the user's busybox configuration
|
||||||
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
|
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
|
||||||
|
Loading…
Reference in New Issue
Block a user