summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 18:00:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 18:00:22 +0000
commit4cc89bd99a32a776cf2df8b5ea428e61aa317b3d (patch)
tree7d47fa533a79442df7a90c6c9575f906473c398b
parenta110b68252d6fad61fc36f08257bb8659c17a693 (diff)
downloadrtems-4cc89bd99a32a776cf2df8b5ea428e61aa317b3d.tar.bz2
Added rejected patch from automake VI from Ralf Corsepius.
Diffstat (limited to '')
-rw-r--r--c/src/make/compilers/gcc-target-default.cfg15
-rw-r--r--make/compilers/gcc-target-default.cfg15
2 files changed, 18 insertions, 12 deletions
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg
index cb82b41a46..c25744af39 100644
--- a/c/src/make/compilers/gcc-target-default.cfg
+++ b/c/src/make/compilers/gcc-target-default.cfg
@@ -59,12 +59,15 @@ LIBC_LIBM=$(RTEMS_LIBC_DIR)/lib/libm.a
endif
else
-CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \
- -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems \
- $(INCLUDE_NETWORKING) $(DEFINES)
-
-ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g -I$(srcdir) \
- -I$(PROJECT_RELEASE)/lib/include $(DEFINES)
+# NOTE: GCCSPECS probably belongs to CPPFLAGS
+# Unfortunately, many custom/*.cfg files do not pass CPPFLAGS
+# to their gcc-2.8 make-exe rules
+GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
+
+CC += $(GCCSPECS)
+CXX += $(GCCSPECS)
+
+CPPFLAGS += -I$(srcdir) $(INCLUDE_NETWORKING)
# default location of Standard C Library
ifndef LIBC_LIBC
diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg
index cb82b41a46..c25744af39 100644
--- a/make/compilers/gcc-target-default.cfg
+++ b/make/compilers/gcc-target-default.cfg
@@ -59,12 +59,15 @@ LIBC_LIBM=$(RTEMS_LIBC_DIR)/lib/libm.a
endif
else
-CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \
- -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems \
- $(INCLUDE_NETWORKING) $(DEFINES)
-
-ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g -I$(srcdir) \
- -I$(PROJECT_RELEASE)/lib/include $(DEFINES)
+# NOTE: GCCSPECS probably belongs to CPPFLAGS
+# Unfortunately, many custom/*.cfg files do not pass CPPFLAGS
+# to their gcc-2.8 make-exe rules
+GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
+
+CC += $(GCCSPECS)
+CXX += $(GCCSPECS)
+
+CPPFLAGS += -I$(srcdir) $(INCLUDE_NETWORKING)
# default location of Standard C Library
ifndef LIBC_LIBC