From b1c2cb4f72490a9f850fd11ef63d96070b27eef4 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Sun, 14 Jul 2019 14:03:06 +1000
Subject: sb/setbuilder: Support staging of build set build before installing.

- Staging lets build sets use previously built build sets.

- Fix the rtems-bsp builds to support staging.
---
 rtems/config/rtems-bsp.cfg | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'rtems/config/rtems-bsp.cfg')

diff --git a/rtems/config/rtems-bsp.cfg b/rtems/config/rtems-bsp.cfg
index 404ad6a..bf1f42b 100644
--- a/rtems/config/rtems-bsp.cfg
+++ b/rtems/config/rtems-bsp.cfg
@@ -24,7 +24,7 @@
 # If a dry-run and with download ignore errors and correct setting for tools
 # and BSPs. Only after the source to download.
 #
-%if %{_dry_run} && %{defined with_download}
+%if %{_dry_run}
  %log BSP configuration errors ignored
  %define rtems_bsp_error 0
 %else
@@ -36,7 +36,7 @@
 # version. It can be defined in rtems_host.
 #
 %if %{defined rtems_host}
- %define _host %{rtems_host}
+ %{triplet _host %{rtems_host}}
 %endif
 %if %{rtems_bsp_error}
  %if %{_host} == %{nil} || %{_host} == %{_build}
@@ -55,18 +55,29 @@
 %endif
 
 #
-# If no tools or RTEMS provided use the prefix.
+# If no tools or RTEMS provided use the prefix. If staging use the staging
+# root.
 #
 %ifn %{defined with_tools}
- %define with_tools %{_prefix}
- %define rtems_waf_tools %{nil}
+ %if %{install_mode} == staging
+  %define with_tools %{stagingroot}
+  %define rtems_waf_tools --rtems-tools=%{with_tools}
+ %else
+  %define with_tools %{_prefix}
+  %define rtems_waf_tools %{nil}
+ %endif
 %else
  %define rtems_waf_tools --rtems-tools=%{with_tools}
 %endif
 
 %ifn %{defined with_rtems}
- %define with_rtems %{_prefix}
- %define rtems_waf_rtems %{nil}
+ %if %{install_mode} == staging
+  %define with_rtems %{stagingroot}
+  %define rtems_waf_rtems --rtems=%{with_rtems}
+ %else
+  %define with_rtems %{_prefix}
+  %define rtems_waf_rtems %{nil}
+ %endif
 %else
  %define rtems_waf_rtems --rtems=%{with_rtems}
 %endif
@@ -111,6 +122,7 @@
 # RTEMS BSP paths
 #
 %define rtems_bsp_cc      %{_host}-gcc
+%define rtems_bsp_cxx     %{_host}-g++
 %define rtems_bsp_incpath %{with_rtems}/%{_host}/%{rtems_bsp}/include
 %define rtems_bsp_libpath %{with_rtems}/%{_host}/%{rtems_bsp}/lib
 
@@ -160,6 +172,8 @@
 #
 # Map to names used for cross compiling.
 #
+%define host_cc       %{rtems_bsp_cc}
+%define host_cxx      %{rtems_bsp_cxx}
 %define host_includes -I%{_includedir}
 %define host_cflags   %{rtems_bsp_cflags}
 %define host_cxxflags %{rtems_bsp_ccflags}
-- 
cgit v1.2.3