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/compilers | |
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/compilers')
-rw-r--r-- | make/compilers/gcc-target-default.cfg | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index 529bc4b742..f91c2a6e31 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -82,7 +82,7 @@ endif # Define this to yes if C++ is included in the development environment. # This requires that at least the GNU C++ compiler and libg++ be installed. -ifeq ($(RTEMS_HAS_CPLUSPLUS),yes) +ifeq ($(HAS_CPLUSPLUS),yes) CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) endif @@ -172,13 +172,15 @@ MKLIB=$(RANLIB) # # How to compile stuff into ${ARCH} subdirectory # +# OBSOLETE: we use make's default rules now +# # NOTE: we override COMPILE.[c|cc|S] # because gmake default rules use TARGET_ARCH for different purposes # - -COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c +# +# COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c +# COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c +# COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c ${ARCH}/%.o: %.c ${COMPILE.c} -o $@ $< @@ -198,13 +200,6 @@ ${ARCH}/%.o: %.C ${ARCH}/%.o: %.S ${COMPILE.S} -DASM -o $@ $< -# OBSOLETE: the rule above should be equivalent. -# strip out C++ style comments. -# ${ARCH}/%.o: %.S -# sed -e 's/\/\/.*$$//' < $< | \ -# $(CPP) $(CPPFLAGS) -I. -I$(srcdir) -DASM - >$(ARCH)/$*.i -# $(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i - # Make foo.rel from foo.o ${ARCH}/%.rel: ${ARCH}/%.o ${LD} $(LDFLAGS_INCOMPLETE) -o $@ $^ @@ -216,10 +211,10 @@ ${ARCH}/%: %.sh $(CHMOD) +x $@ # Dependency files for use by gmake -# NOTE: we don't put in $(TARGET_ARCH) +# NOTE: we don't put them into $(ARCH) # so that 'make clean' doesn't blow it away -DEPEND=Depends-$(TARGET_ARCH:o-%=%) +DEPEND=Depends-${ARCH} CLEAN_DEPEND=$(DEPEND).tmp CLOBBER_DEPEND=$(DEPEND) |