From 8effa3e542c0a2ded4cc36fcd446aab834a6eb25 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Tue, 30 Jun 2020 17:55:53 +1000 Subject: sb/options: A Canadian Cross is a different host, build and target The check must make sure each is different. --- source-builder/sb/options.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py index f0f5ea4..fe4182d 100644 --- a/source-builder/sb/options.py +++ b/source-builder/sb/options.py @@ -431,13 +431,12 @@ class command_line: _build = self.defaults.expand('%{_build}') _target = self.defaults.expand('%{_target}') # - # This has been removed to fix how RTEMS 3rd party libraries - # are built. This may break Cxc tools builds. + # The removed fix has been put back. I suspect + # this was done as a result of another issue that + # has been fixed. # - # if len(_target): - # return len(_host) and len(_build) and (_target) and \ - # _host != _build and _host != _target - return len(_target) and len(_host) and len(_build) and _host != _build + return len(_target) and len(_host) and len(_build) \ + and _host != _build and _host != _target def user_macros(self): # -- cgit v1.2.3