diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-02-07 15:14:32 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-02-07 15:14:32 +1100 |
| commit | 38228039ecba76c8342f646b2b2f8a5b00aceeaf (patch) | |
| tree | 0fc97dd75adcf7027593916cb45bd2903eeb15a2 | |
| parent | de9ca906d3d1ebcf2eb8fcb1831a586feffaea83 (diff) | |
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 #3074
| -rw-r--r-- | rtems/config/rtems-base.bset | 3 | ||||
| -rw-r--r-- | source-builder/config/gcc-common-1.cfg | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/rtems/config/rtems-base.bset b/rtems/config/rtems-base.bset index 0e61423..48f4218 100644 --- a/rtems/config/rtems-base.bset +++ b/rtems/config/rtems-base.bset @@ -15,7 +15,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 ec81d9b..9154026 100644 --- a/source-builder/config/gcc-common-1.cfg +++ b/source-builder/config/gcc-common-1.cfg @@ -32,6 +32,15 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) %global _gcclibdir %{_prefix}/lib # +# 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 |