sidestep using the config.guess that comes with a package in ConfigureMake generic easyblock

easybuild/easyblocks/generic/configuremake.py

@@ -52,6 +52,8 @@ def extra_options(extra_vars=None):
             'configure_cmd_prefix': ['', "Prefix to be glued before ./configure", CUSTOM],
             'prefix_opt': [None, "Prefix command line option for configure script ('--prefix=' if None)", CUSTOM],
             'tar_config_opts': [False, "Override tar settings as determined by configure.", CUSTOM],
+            'build_type': [None, "Type of system package is being configured for, e.g., x86_64-pc-linux-gnu (determined"
+                                 " by config.guess shipped with EasyBuild if None)", CUSTOM],
         })
         return extra_vars
 
@@ -83,11 +85,23 @@ def configure_step(self, cmd_prefix=''):
         if prefix_opt is None:
             prefix_opt = '--prefix='
 
-        cmd = "%(preconfigopts)s %(cmd_prefix)s./configure %(prefix_opt)s%(installdir)s %(configopts)s" % {
+        # Avoid using config.guess from the package as it is frequently out of date, use the version shipped with EB
+        build_type = self.cfg.get('build_type')
+        if build_type is None:
+            build_type, exit_code = run_cmd('config.guess')
+            if exit_code != 0:
+                raise EasyBuildError("config.guess shipped with EB could not determine build type: '%s'",
+                                     build_type)
+            build_type = build_type.strip()
+        build_type_option = '--build=' + build_type
+
+        cmd = ("%(preconfigopts)s %(cmd_prefix)s./configure %(prefix_opt)s%(installdir)s %(build_type_option)s "
+               "%(configopts)s") % {
             'preconfigopts': self.cfg['preconfigopts'],
             'cmd_prefix': cmd_prefix,
             'prefix_opt': prefix_opt,
             'installdir': self.installdir,
+            'build_type_option': build_type_option,
             'configopts': self.cfg['configopts'],
         }