summaryrefslogtreecommitdiffstats
path: root/source-builder
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2020-06-30 17:55:53 +1000
committerChris Johns <chrisj@rtems.org>2020-06-30 18:03:23 +1000
commit8effa3e542c0a2ded4cc36fcd446aab834a6eb25 (patch)
treee3d28bacd41d4a7de25fc0567ade197d42ce79cb /source-builder
parent6/7: Use RTEMS 6 tools (diff)
downloadrtems-source-builder-8effa3e542c0a2ded4cc36fcd446aab834a6eb25.tar.bz2
sb/options: A Canadian Cross is a different host, build and target
The check must make sure each is different.
Diffstat (limited to 'source-builder')
-rw-r--r--source-builder/sb/options.py11
1 files 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):
#