summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rtems.py13
-rw-r--r--rtems_bsd.py4
2 files changed, 13 insertions, 4 deletions
diff --git a/rtems.py b/rtems.py
index 0b24645..1566e58 100644
--- a/rtems.py
+++ b/rtems.py
@@ -714,6 +714,7 @@ def output_command_line():
# From the extras. Use this to support long command lines.
#
def long_command_line():
+
def exec_command(self, cmd, **kw):
# workaround for command line length limit:
# http://support.microsoft.com/kb/830473
@@ -858,11 +859,19 @@ def _check_arch_bsps(req, config, path, archs, version):
def _arch_from_arch_bsp(arch_bsp):
- return '-'.join(arch_bsp.split('-')[:2])
+ fields = arch_bsp.split('-')
+ for i, field in enumerate(fields):
+ if field.startswith('rtems') and fields[:(i + 1)] is not None:
+ return '-'.join(fields[:(i + 1)])
+ return None
def _bsp_from_arch_bsp(arch_bsp):
- return '-'.join(arch_bsp.split('-')[2:])
+ fields = arch_bsp.split('-')
+ for i, field in enumerate(fields):
+ if field.startswith('rtems') and fields[(i + 1):] is not None:
+ return '-'.join(fields[(i + 1):])
+ return None
def _pkgconfig_path(path):
diff --git a/rtems_bsd.py b/rtems_bsd.py
index 7fbe66f..8faae10 100644
--- a/rtems_bsd.py
+++ b/rtems_bsd.py
@@ -71,8 +71,8 @@ def bsp_configure(conf, arch_bsp, mandatory=True):
'configure RTEMS with --disable-networking')
rtems_libbsd_path = conf.options.rtems_libbsd
if rtems_libbsd_path is None:
- if conf.options.rtems is None:
- rtems_libbsd_path = conf.options.rtems
+ if conf.options.rtems_path is not None:
+ rtems_libbsd_path = conf.options.rtems_path
else:
rtems_libbsd_path = conf.env.PREFIX