From 3c87d137a3f0823289c52ffff87e58b8b1d7e271 Mon Sep 17 00:00:00 2001
From: Mario Melara <maamelara@gmail.com>
Date: Mon, 22 Feb 2016 16:17:33 -0800
Subject: Added compiler strategy entry and also added new operating system
 subclass called CNL for compute node linux (name will probably change because
 I can't find docs on the EXACT name)

---
 lib/spack/spack/operating_system/cnl.py          | 20 ++++++++++++++++++++
 lib/spack/spack/operating_system/linux_distro.py | 10 +++++++---
 lib/spack/spack/operating_system/mac_osx.py      |  9 ++++++---
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 lib/spack/spack/operating_system/cnl.py

(limited to 'lib')

diff --git a/lib/spack/spack/operating_system/cnl.py b/lib/spack/spack/operating_system/cnl.py
new file mode 100644
index 0000000000..e52052dfa8
--- /dev/null
+++ b/lib/spack/spack/operating_system/cnl.py
@@ -0,0 +1,20 @@
+import spack
+from spack.architecture import OperatingSystem
+
+class ComputeNodeLinux(OperatingSystem):
+    """ Compute Node Linux (CNL) is the operating system used for the Cray XC
+    series super computers. It is a very stripped down version of GNU/Linux.
+    Any compilers found through this operating system will be used with
+    modules. If updated, user must make sure that version and name are 
+    updated to indicate that OS has been upgraded (or downgraded)
+    """
+    def __init__(self):
+        name = 'CNL'
+        version = '10'
+        super(ComputeNodeLinux, self).__init__(name, version, "MODULES")
+
+    def compiler_strategy(self):
+        return self.compiler_strategy
+
+    def find_compilers(self):
+        pass
diff --git a/lib/spack/spack/operating_system/linux_distro.py b/lib/spack/spack/operating_system/linux_distro.py
index 30a85fe61c..b11c7a88fa 100644
--- a/lib/spack/spack/operating_system/linux_distro.py
+++ b/lib/spack/spack/operating_system/linux_distro.py
@@ -17,9 +17,13 @@ class LinuxDistro(OperatingSystem):
 
         name, version = detect_operating_system()
             
-        super(LinuxDistro, self).__init__(name, version)
+        super(LinuxDistro, self).__init__(name, version, "PATH")
     
-    @property
     def compiler_strategy(self):
-        return "PATH"
+        return self.compiler_strategy
+
+    def find_compilers(self):
+        pass
+
+    
 
diff --git a/lib/spack/spack/operating_system/mac_osx.py b/lib/spack/spack/operating_system/mac_osx.py
index 0b939a5546..f52cdd6bc7 100644
--- a/lib/spack/spack/operating_system/mac_osx.py
+++ b/lib/spack/spack/operating_system/mac_osx.py
@@ -34,11 +34,14 @@ class MacOSX(OperatingSystem):
 
         name, version = get_mac_release()
 
-        super(MacOSX, self).__init__(name, version)
+        super(MacOSX, self).__init__(name, version, "PATH")
 
-    @property
     def compiler_strategy(self):
-        return "PATH"
+        return self.compiler_strategy
+
+    def find_compilers(self):
+        pass
+        
 
 
 
-- 
cgit v1.2.3-70-g09d2