summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-03-17 17:54:27 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-03-17 17:54:27 +0000
commit08b1e437eddc0302746d8df942330fd3d1065e23 (patch)
tree5605ca91c3f3fef9ee21cac35b173c26daaa0ddd
parent2004-03-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-08b1e437eddc0302746d8df942330fd3d1065e23.tar.bz2
2004-03-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/target-gcc.add, gcc3newlib/target-c++.add: Reflect changes to gcc3newlib/gccnewlib.add.
-rw-r--r--scripts/ChangeLog5
-rw-r--r--scripts/gcc3newlib/target-c++.add8
-rw-r--r--scripts/gcc3newlib/target-gcc.add10
3 files changed, 17 insertions, 6 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 687ab70306..268d5c3acb 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,10 @@
2004-03-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * gcc3newlib/target-gcc.add, gcc3newlib/target-c++.add:
+ Reflect changes to gcc3newlib/gccnewlib.add.
+
+2004-03-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* gcc3newlib/gccnewlib.add: Preps. for gcc-3.4.0.
Add %gcclib, %gccexec.
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index e96f876f42..27ae80703a 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -20,11 +20,11 @@ This is the gcc/g++ compiler for %{gcc_target}
%{_prefix}/bin/%{gcc_target}-c++%{_exeext}
%{_prefix}/bin/%{gcc_target}-g++%{_exeext}
-%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include
+%{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
+%dir %{gcclib}/%{gcc_target}/%{gcc_version}/include
%if "%{gcc_version}" >= "3.2"
-%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include/c++
+%{gcclib}/%{gcc_target}/%{gcc_version}/include/c++
%else
-%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include/g++
+%{gcclib}/%{gcc_target}/%{gcc_version}/include/g++
%endif
%endif
diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add
index b2f48ff091..ce61dd5a16 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -14,7 +14,10 @@ This is gcc and newlib C Library for %{gcc_target}.
%files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
%defattr(-,root,root)
%doc %{_prefix}/man/man1/%{gcc_target}-gcc.1*
-
+%if "%{gcc_version}" >= "3.4"
+%doc %{_prefix}/man/man1/%{gcc_target}-cpp.1*
+%doc %{_prefix}/man/man1/%{gcc_target}-gcov.1*
+%endif
%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
%{_prefix}/bin/%{gcc_target}-gcc%{_exeext}
%if "%{gcc_version}" >= "3.3"
@@ -24,4 +27,7 @@ This is gcc and newlib C Library for %{gcc_target}.
%{_prefix}/bin/%{gcc_target}-gccbug
%{_prefix}/%{gcc_target}/include
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include
+%dir %{gcclib}/%{gcc_target}/%{gcc_version}/include
+
+%{gccexec}/%{gcc_target}/%{gcc_version}/cc1%{_exeext}
+%{gccexec}/%{gcc_target}/%{gcc_version}/collect2%{_exeext}