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.
This commit is contained in:
Ralf Corsepius
2002-08-15 23:12:04 +00:00
parent a50b011f70
commit 682c7502d2
4 changed files with 13 additions and 11 deletions

View File

@@ -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*.

View File

@@ -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 =

View File

@@ -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);;

View File

@@ -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