diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-06 17:55:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-06 17:55:25 +0000 |
| commit | 3a8915e6ee7974d832994d218c6a90b83cd86323 (patch) | |
| tree | 3dde98ccb6120fb27412044b6b951c2af13a2781 /c/src/make/compilers | |
| parent | Typo -- removed blank line at top of file. (diff) | |
| download | rtems-3a8915e6ee7974d832994d218c6a90b83cd86323.tar.bz2 | |
Patch rtems-rc-19990709-6-diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
applied. This modified many Makefiles and custom files and makes many more
settings (network, multiprocessing, etc) gnerated by autoconf.
Diffstat (limited to '')
| -rw-r--r-- | c/src/make/compilers/Makefile.in | 3 | ||||
| -rw-r--r-- | c/src/make/compilers/gcc-target-default.cfg | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/c/src/make/compilers/Makefile.in b/c/src/make/compilers/Makefile.in index d488642e79..6a737104bd 100644 --- a/c/src/make/compilers/Makefile.in +++ b/c/src/make/compilers/Makefile.in @@ -86,7 +86,10 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXX_FOR_TARGET = @CXX_FOR_TARGET@ GCCSED = @GCCSED@ +HAS_CPLUSPLUS = @HAS_CPLUSPLUS@ HAS_MP = @HAS_MP@ +HAS_NETWORKING = @HAS_NETWORKING@ +HAS_POSIX_API = @HAS_POSIX_API@ HAS_RDBG = @HAS_RDBG@ INSTALL_CHANGE = @INSTALL_CHANGE@ KSH = @KSH@ diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index 49f1326f78..835b22c558 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/c/src/make/compilers/gcc-target-default.cfg @@ -87,10 +87,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) -HAS_CPLUSPLUS=yes CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) -else -HAS_CPLUSPLUS=no endif # debug flag; @@ -287,15 +284,13 @@ endif LINK_OBJS =\ $(CONSTRUCTOR) \ $(OBJS) \ - $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ - $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) + $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) LINK_FILES =\ $(START_FILE) \ $(CONSTRUCTOR) \ $(OBJS) \ $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ - $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) \ $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA) ifeq ($(RTEMS_USE_GCC272),yes) |