[rtems-source-builder commit] sb/options: A Canadian Cross is a different host, build and target
Chris Johns
chrisj at rtems.org
Tue Jun 30 08:04:33 UTC 2020
Module: rtems-source-builder
Branch: 5
Commit: 9b1545f1461a4741f3cb53528495d89b72cb5036
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=9b1545f1461a4741f3cb53528495d89b72cb5036
Author: Chris Johns <chrisj at rtems.org>
Date: Tue Jun 30 17:55:53 2020 +1000
sb/options: A Canadian Cross is a different host, build and target
The check must make sure each is different.
Closes #4017
---
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):
#
More information about the vc
mailing list