From 6db01e577fed1dc88018106b81dd531f2ecc1fd0 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 29 Nov 2018 10:14:14 +1100
Subject: rtemstoolkit/host: Fix the darwin support.

- Add python as a unit test variant.
---
 rtemstoolkit/darwin.py | 3 +--
 rtemstoolkit/host.py   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'rtemstoolkit')

diff --git a/rtemstoolkit/darwin.py b/rtemstoolkit/darwin.py
index f7ce0da..e780d1d 100644
--- a/rtemstoolkit/darwin.py
+++ b/rtemstoolkit/darwin.py
@@ -49,7 +49,7 @@ def cpus():
 
 def overrides():
     uname = os.uname()
-    ncpus = '%d' % (cores())
+    ncpus = '%d' % (cpus())
     defines = {
         '_ncpus':         ('none',    'none',     ncpus),
         '_os':            ('none',    'none',     'darwin'),
@@ -63,7 +63,6 @@ def overrides():
         '_usr':           ('dir',     'optional', '/usr/local'),
         '_var':           ('dir',     'optional', '/usr/local/var'),
         '__ldconfig':     ('exe',     'none',     ''),
-        '__cvs':          ('exe',     'required', 'cvs'),
         '__xz':           ('exe',     'required', '%{_usr}/bin/xz'),
         'with_zlib':      ('none',    'none',     '--with-zlib=no'),
         '_forced_static': ('none',    'none',     '')
diff --git a/rtemstoolkit/host.py b/rtemstoolkit/host.py
index ba24c9d..5319c92 100644
--- a/rtemstoolkit/host.py
+++ b/rtemstoolkit/host.py
@@ -56,11 +56,11 @@ def _load():
         if uname[0].startswith('MINGW64_NT') or uname[0].startswith('CYGWIN_NT'):
             name = 'windows'
         elif uname[0] == 'Darwin':
-            name = darwin
+            name = 'darwin'
         elif uname[0] == 'FreeBSD':
             name = 'freebsd'
         elif uname[0] == 'NetBSD':
-            name = netbsd
+            name = 'netbsd'
         elif uname[0] == 'Linux':
             name = 'linux'
         elif uname[0] == 'SunOS':
-- 
cgit v1.2.3