Merge pull request easybuilders#1069 from boegel/mono

update sanity check for Mono to support recent versions
damianam · Dec 12, 2016 · 8a7e36c · 8a7e36c
2 parents 70d3cc1 + c91d856
commit 8a7e36c
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/easybuild/easyblocks/m/mono.py b/easybuild/easyblocks/m/mono.py
@@ -31,6 +31,7 @@
 @author: Pieter De Baets (Ghent University)
 @author: Jens Timmerman (Ghent University)
 """
+from distutils.version import LooseVersion
 import re
 import os
 import shutil
@@ -171,8 +172,14 @@ def configure_step(self):
     def sanity_check_step(self):
         """Custom sanity check for Mono."""
 
+        binaries = ['bin/mono', 'bin/xbuild']
+        if LooseVersion(self.version) >= LooseVersion('2.11'):
+            binaries.append('bin/mcs')
+        else:
+            binaries.append('bin/gmcs')
+
         custom_paths = {
-            'files': ['bin/mono', 'bin/gmcs', 'bin/xbuild'],
-            'dirs': ['include/mono-%s.0/mono' % self.version.split('.')[0], 'lib'],
+            'files': binaries,
+            'dirs': ['include/mono-2.0/mono', 'lib'],
         }
         ConfigureMake.sanity_check_step(self, custom_paths=custom_paths)