[rtems-source-builder commit] gcc: Use the RSB release for released tools.

[Chris Johns]

Module:    rtems-source-builder
Branch:    master
Commit:    858b6488e4959036ffdecaec0e3144606be5f63d
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=858b6488e4959036ffdecaec0e3144606be5f63d

Author:    Chris Johns <chrisj at rtems.org>
Date:      Wed Feb  7 15:27:47 2018 +1100

gcc: Use the RSB release for released tools.

Using the RSB release version for the gcc version string means the
tools have a version string that matches the release.

Close #3294

---

 rtems/config/rtems-base.bset           | 3 ++-
 source-builder/config/gcc-common-1.cfg | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rtems/config/rtems-base.bset b/rtems/config/rtems-base.bset
index 04c9679..5a7cc98 100644
--- a/rtems/config/rtems-base.bset
+++ b/rtems/config/rtems-base.bset
@@ -20,7 +20,8 @@ package: rtems-%{rtems_version}-%{_target}-%{_host}-%{release}
 #
 # Project custom message
 #
-%define gcc_version_message RTEMS %{rtems_version}, RSB %{_sbgit_id}, Newlib %{newlib_version}
+%define rtems_gcc_version %{rtems_version}
+%define gcc_version_message RTEMS %{rtems_gcc_version}, RSB %{_sbgit_id}, Newlib %{newlib_version}
 
 #
 # Pick up the RTEMS URLs.
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index c04c243..03d84bc 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -39,6 +39,15 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 %endif
 
 #
+# The GCC version depends on the type of build we are doing.
+#
+%if %{rsb_released}
+ %define rtems_gcc_version %{rsb_version}
+%else
+ %define rtems_gcc_version %{rtems_version}
+%endif
+
+#
 # Prepare the source code.
 #
 %prep