diff options
Diffstat (limited to 'source-builder/sb')
| -rw-r--r-- | source-builder/sb/options.py | 12 | ||||
| -rwxr-xr-x | source-builder/sb/rtems-build-dep | 2 | ||||
| -rw-r--r-- | source-builder/sb/setbuilder.py | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py index ae67eeb..d8e7a88 100644 --- a/source-builder/sb/options.py +++ b/source-builder/sb/options.py @@ -420,10 +420,14 @@ class command_line: _host = self.defaults.expand('%{_host}') _build = self.defaults.expand('%{_build}') _target = self.defaults.expand('%{_target}') - if len(_target): - return len(_host) and len(_build) and (_target) and \ - _host != _build and _host != _target - return len(_host) and len(_build) and _host != _build + # + # This has been removed to fix how RTEMS 3rd party libraries + # are built. This may break Cxc tools builds. + # + # 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 def user_macros(self): # diff --git a/source-builder/sb/rtems-build-dep b/source-builder/sb/rtems-build-dep index 1f795d3..48a0823 100755 --- a/source-builder/sb/rtems-build-dep +++ b/source-builder/sb/rtems-build-dep @@ -141,7 +141,7 @@ fi # Library file # if [ ${op} = "library" ]; then - if [ "${OS}" = "Windows_NT" -a "${OSTYPE}" -ne "cygwin" ]; then + if [ "${OS}" = "Windows_NT" -a "${OSTYPE}" != "cygwin" ]; then sep=';' else sep=':' diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index c94ff8b..159a673 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -413,7 +413,7 @@ class buildset: # Dump post build macros. # log.trace('_bset: macros post-build') - log.trace(str(macros)) + log.trace(str(b.macros)) else: raise error.general('invalid config type: %s' % (configs[s])) except error.general as gerr: |