3 files changed, 45 insertions, 3 deletions
diff --git a/buildstream/_options/optionarch.py b/buildstream/_options/optionarch.py
index 13a691643..1d8509cf2 100644
--- a/buildstream/_options/optionarch.py
+++ b/buildstream/_options/optionarch.py
@@ -17,7 +17,7 @@
 #  Authors:
 #        Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
 
-import os
+from .._platform import Platform
 from .optionenum import OptionEnum
 
 
@@ -41,8 +41,7 @@ class OptionArch(OptionEnum):
         super(OptionArch, self).load(node, allow_default_definition=False)
 
     def load_default_value(self, node):
-        _, _, _, _, machine_arch = os.uname()
-        return machine_arch
+        return Platform.get_host_arch()
 
     def resolve(self):
 
diff --git a/buildstream/_options/optionos.py b/buildstream/_options/optionos.py
new file mode 100644
index 000000000..e76cf177c
--- /dev/null
+++ b/buildstream/_options/optionos.py
@@ -0,0 +1,41 @@
+
+#
+#  Copyright (C) 2017 Codethink Limited
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library. If not, see <http://www.gnu.org/licenses/>.
+#
+#  Authors:
+#        Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk>
+
+import os
+from .optionenum import OptionEnum
+
+
+# OptionOS
+#
+class OptionOS(OptionEnum):
+
+    OPTION_TYPE = 'os'
+
+    def load(self, node):
+        super(OptionOS, self).load(node, allow_default_definition=False)
+
+    def load_default_value(self, node):
+        return os.uname()[0]
+
+    def resolve(self):
+
+        # Validate that the default OS reported by uname() is explicitly
+        # supported by the project, if not overridden by user config or cli.
+        self.validate(self.value)
diff --git a/buildstream/_options/optionpool.py b/buildstream/_options/optionpool.py
index 1274586f7..3132af564 100644
--- a/buildstream/_options/optionpool.py
+++ b/buildstream/_options/optionpool.py
@@ -28,6 +28,7 @@ from .optionenum import OptionEnum
 from .optionflags import OptionFlags
 from .optioneltmask import OptionEltMask
 from .optionarch import OptionArch
+from .optionos import OptionOS
 
 
 _OPTION_TYPES = {
@@ -36,6 +37,7 @@ _OPTION_TYPES = {
     OptionFlags.OPTION_TYPE: OptionFlags,
     OptionEltMask.OPTION_TYPE: OptionEltMask,
     OptionArch.OPTION_TYPE: OptionArch,
+    OptionOS.OPTION_TYPE: OptionOS,
 }