diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-01-18 06:49:16 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-01-18 06:49:16 +0000 |
| commit | 16c5071c6d5d4977a9f1a16c7c1cc05b9301b2ee (patch) | |
| tree | c36efe34f96a73eb70fc765ede68fb984e3ec7ef /compiler-rt/make | |
| parent | 6bcbef6230a31c82e3d2c3a2d0f1c49b86c2a655 (diff) | |
| download | llvm-16c5071c6d5d4977a9f1a16c7c1cc05b9301b2ee.tar.gz llvm-16c5071c6d5d4977a9f1a16c7c1cc05b9301b2ee.tar.bz2 llvm-16c5071c6d5d4977a9f1a16c7c1cc05b9301b2ee.zip | |
Remove old build logic, this is going to be replaced by a more configurable mechanism shortly.
llvm-svn: 93719
Diffstat (limited to 'compiler-rt/make')
| -rw-r--r-- | compiler-rt/make/config.mk | 42 | ||||
| -rw-r--r-- | compiler-rt/make/subdir.mk | 24 |
2 files changed, 0 insertions, 66 deletions
diff --git a/compiler-rt/make/config.mk b/compiler-rt/make/config.mk index 903424d01b3d..5dfc74ca138b 100644 --- a/compiler-rt/make/config.mk +++ b/compiler-rt/make/config.mk @@ -8,48 +8,6 @@ OS := $(shell uname) ProjSrcRoot := $(shell pwd) ProjObjRoot := $(ProjSrcRoot) -Configs := Debug Release Profile - -# The full list of architectures we support. -Archs := i386 ppc x86_64 -# armv6 armv7 - -# If TargetArch is defined, only build for that architecture (and don't use -# -arch). -ifeq ($(OS), Darwin) - TargetArch := - TargetArchs := $(Archs) -else - TargetArch := i386 - TargetArchs := $(TargetArch) -endif - -Common.CFLAGS := -Wall -Werror - -# These names must match the configs, see GetArgs function. -Debug.CFLAGS := -g -Release.CFLAGS := -O3 -fomit-frame-pointer -Profile.CFLAGS := -pg -g - -# Function: GetArchArgs arch -# -# Return the compiler flags for the given arch. -ifeq ($(OS), Darwin) - GetArchArgs = -arch $(1) -else - # Check that we are only trying to build the target arch. - GetArchArgs = $(if $(subst $(TargetArch),,$(1)), \ - $(error "Invalid configuration, no -arch support: $(1)"), \ - ) -endif - -# Function: GetArgs config arch -# -# Return the compiler flags for the given config & arch. -GetArgs = $(if $($(1).CFLAGS), \ - $(Common.CFLAGS) $($(1).CFLAGS) $(call GetArchArgs,$(2)), \ - $(error "Invalid configuration: $(1)")) - ### # Tool configuration variables. diff --git a/compiler-rt/make/subdir.mk b/compiler-rt/make/subdir.mk index 4b1b83e08922..b0981dcb67b6 100644 --- a/compiler-rt/make/subdir.mk +++ b/compiler-rt/make/subdir.mk @@ -15,30 +15,6 @@ ifeq ($(Dir),) $(error "No Dir variable defined.") endif -# Expand template for each configuration and architecture. -# -# FIXME: This level of logic should be in primary Makefile? -ifeq ($(OnlyConfigs),) - ConfigsToTraverse := $(Configs) -else - ConfigsToTraverse := $(OnlyConfigs) -endif - -ifeq ($(OnlyArchs),) - ArchsToTraverse := $(Archs) -else - ArchsToTraverse := $(OnlyArchs) -endif - -# If we are only targetting a single arch, only traverse that. -ifneq ($(TargetArch),) - ArchsToTraverse := $(filter $(TargetArch), $(ArchsToTraverse)) -endif - -$(foreach config,$(ConfigsToTraverse), \ - $(foreach arch,$(ArchsToTraverse), \ - $(eval $(call CNA_subdir_template,$(config),$(arch),$(Dir))))) - ### # Include child makefile fragments |