diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-16 15:48:11 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-16 15:48:11 +0000 |
| commit | d6c8352925bc2286b24f01b8cfababa16782b1f5 (patch) | |
| tree | 2543aced22107ce690b426cf39b6431dda5e07b9 /make/leaf.cfg | |
| parent | Modified file to match seen output. (diff) | |
| download | rtems-d6c8352925bc2286b24f01b8cfababa16782b1f5.tar.bz2 | |
Patch rtems-rc-19991105-1.diff.gz from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> which does the following:
This is the configuration cleanup patch:
Main changes:
* TARGET_ARCH removed
* target.cfg.in moved to c/make/target.cfg.in (Only configured once for
all BSPs of a target)
* BARE_XXX variables appended to bsp.cfg.in
* autogen renamed to bootstrap
* removed stray variables from make/custom/*.cfg
To apply:
cd <source-tree>
rm c/src/make/target.cfg.in
cp autogen bootstrap
mkdir c/make
cp make/target.cfg.in c/make/target.cfg.in
rm make/target.cfg.in
rm autogen
patch -p1 < rtems-rc-19991105-1.diff
Diffstat (limited to 'make/leaf.cfg')
| -rw-r--r-- | make/leaf.cfg | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make/leaf.cfg b/make/leaf.cfg index 06407755ae..e96c68732b 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -37,7 +37,7 @@ MANAGERS := $(sort $(MANAGERS)) # Pull in the desired "target" compiler # Programs built on the host use automake generated rules. # This will not change $(ARCH) -- binaries will still be place as per target -include ${CONFIG.$(TARGET_ARCH).CC} +include ${CONFIG.CC} ifeq (${DEPEND},$(wildcard ${DEPEND})) include ${DEPEND} # pull in dependencies if they exist endif @@ -46,14 +46,14 @@ endif # Builtin targets for compilation variants # debug: - $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-debug" \ + $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=o-debug" \ "CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \ "CFLAGS_OPTIMIZE=$(CFLAGS_DEBUG_OPTIMIZE_V)" \ "LDFLAGS_DEBUG=$(LDFLAGS_DEBUG_V)" $(TARGET_VA) profile: $(MAKE) -f $(MAKEFILE) \ - MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-profile" \ + MAKEFILE=$(MAKEFILE) "ARCH=o-profile" \ "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \ "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA) @@ -63,9 +63,9 @@ profile: # build something "the same" way. # -VARIANT-$(TARGET_ARCH)-v = -VARIANT-$(TARGET_ARCH)-debug-v = debug -VARIANT-$(TARGET_ARCH)-profile-v = profile +VARIANT-o-optimize-v = +VARIANT-o-debug-v = debug +VARIANT-o-profile-v = profile VARIANT_VA = $(VARIANT-$(ARCH)-v) @@ -86,9 +86,9 @@ TARGET_VA = $(TARGET_$@_V) # Useful for installing libraries. # -LIBSUFFIX_$(TARGET_ARCH)_V= -LIBSUFFIX_$(TARGET_ARCH)-debug_V=_g -LIBSUFFIX_$(TARGET_ARCH)-profile_V=_p +LIBSUFFIX_o-optimize_V= +LIBSUFFIX_o-debug_V=_g +LIBSUFFIX_o-profile_V=_p LIB_VARIANT=$(LIBSUFFIX_$(ARCH)_V) LIBSUFFIX_VA = $(LIB_VARIANT).a |