summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-08-15 23:12:04 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-08-15 23:12:04 +0000
commit682c7502d2e80e3d405f137cfe04c3e8dd818b0f (patch)
tree0194f33317d7e6b4c8156fb89de5427d50cfe172 /scripts
parent2002-08-14 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-682c7502d2e80e3d405f137cfe04c3e8dd818b0f.tar.bz2
2002-08-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/Makefile.am: Remove c_only remnants. * gcc3newlib/gccnewlib.add: Reflect gcc-3.2 putting c++ headers into c++ instead of g++. * gcc3newlib/target-c++.add: Ditto.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog7
-rw-r--r--scripts/gcc3newlib/Makefile.am12
-rw-r--r--scripts/gcc3newlib/gccnewlib.add1
-rw-r--r--scripts/gcc3newlib/target-c++.add4
4 files changed, 13 insertions, 11 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 6043df3061..76fa09083e 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * gcc3newlib/Makefile.am: Remove c_only remnants.
+ * gcc3newlib/gccnewlib.add: Reflect gcc-3.2 putting c++
+ headers into c++ instead of g++.
+ * gcc3newlib/target-c++.add: Ditto.
+
2002-08-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/base-gnat.add: Don't use %{%prefix}/bin/gnat*.
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index 8a23fc2d18..37c9f051ac 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -12,24 +12,14 @@ SUBPACKAGES = gccnewlib.add \
target-c++.add \
base-gnat.add target-gnat.add
-noinst_DATA = gccnewlib.spec.in gccnewlib_c_only.spec.in
+noinst_DATA = gccnewlib.spec.in
gccnewlib.spec.in: $(SUBPACKAGES)
cat $^ > $@
CLEANFILES = gccnewlib.spec.in
-gccnewlib_c_only.spec.in: gccnewlib.add base-gcc.add target-gcc.add \
- target-c++.add
- cat $^ \
- | sed -e "s%@GCCLANGS@%\'--enable-languages=c,c++\'%g" > $@
-CLEANFILES += gccnewlib_c_only.spec.in
-
-C_ONLY_ARG = -a $(top_builddir)/gcc3newlib/gccnewlib_c_only.spec.in
-
MKGCCNEWLIBSPEC_DEPS = $(top_builddir)/mkgcc3newlibspec gccnewlib.spec.in \
$(top_builddir)/setup.cache
-MKGCCNEWLIB_C_ONLY_SPEC_DEPS = $(top_builddir)/mkgcc3newlibspec \
- gccnewlib_c_only.spec.in $(top_builddir)/setup.cache
RPM_SPECS_DATA =
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index d85aae708b..6855ee15ae 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -225,6 +225,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
*libobjc*) echo "$i" >> files.objc ;;
*include/objc*) ;;
*include/g++*);;
+ *include/c++*);;
*adainclude*);;
*adalib*);;
*gnat1);;
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index 0850623447..b00a40ec14 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -23,5 +23,9 @@ This is the gcc/g++ compiler for @target_alias@
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1plus@exe_ext@
%dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
+%if "@gcc_version@" >= "3.2"
+%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/c++
+%else
%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/g++
%endif
+%endif