summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-02-07 15:22:16 +1100
committerChris Johns <chrisj@rtems.org>2018-02-08 08:56:13 +1100
commitf75dd49ce80d0dc4d0cb7478d29e224d3d8ad7c6 (patch)
tree3c3302f1eec624d90addebd85e521acdb1b51b70
parent70159fb9e3db5b68bd4aeed432deab0537bc37d8 (diff)
downloadrtems-source-builder-f75dd49ce80d0dc4d0cb7478d29e224d3d8ad7c6.tar.bz2
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 #3293
-rw-r--r--rtems/config/rtems-base.bset3
-rw-r--r--source-builder/config/gcc-common-1.cfg9
2 files changed, 11 insertions, 1 deletions
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 0bf59b6..eafd958 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -42,6 +42,15 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%define disable_MAKEINFO 1
#
+# 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