Merge pull request #3703 from Thyre/binutils-add-gold-option

binutils: Do not build ld.gold with binutils 2.44 or newer

Author: jfgrimm

easybuild/easyblocks/b/binutils.py

@@ -60,8 +60,11 @@ def __init__(self, *args, **kwargs):
         """Easyblock constructor"""
         super(EB_binutils, self).__init__(*args, **kwargs)
 
-        # ld.gold linker is not supported on RISC-V
-        self.use_gold = get_cpu_family() != RISCV
+        if LooseVersion(self.version) >= LooseVersion('2.44') or get_cpu_family() == RISCV:
+            # ld.gold linker is not supported on RISC-V, and is being phased out starting from v2.44
+            self.use_gold = False
+        else:
+            self.use_gold = True
 
     def determine_used_library_paths(self):
         """Check which paths are used to search for libraries"""

easybuild/easyblocks/g/gcc.py

@@ -47,8 +47,8 @@
 from easybuild.easyblocks.generic.configuremake import ConfigureMake
 from easybuild.framework.easyconfig import CUSTOM
 from easybuild.tools.build_log import EasyBuildError
-from easybuild.tools.config import build_option
-from easybuild.tools.filetools import apply_regex_substitutions, adjust_permissions, change_dir, copy_file
+from easybuild.tools.config import build_option, IGNORE
+from easybuild.tools.filetools import apply_regex_substitutions, adjust_permissions, change_dir, copy_file, search_file
 from easybuild.tools.filetools import mkdir, move_file, read_file, symlink, which, write_file
 from easybuild.tools.modules import MODULE_LOAD_ENV_HEADERS, get_software_root
 from easybuild.tools.run import run_shell_cmd
@@ -677,13 +677,32 @@ def configure_step(self):
         # enable plugin support
         self.configopts += " --enable-plugins "
 
+        # Determine if ld.gold is available, as being slowly faded out with binutils 2.44 and newer.
+        # If binutils is loaded, check for ld.gold inside of that installation.
+        # If not loaded, check in $PATH, as binutils might have been filtered.
+        binutils_has_ld_gold = False
+        binutils_root = get_software_root('binutils')
+        if binutils_root:
+            _, hits = search_file([binutils_root], 'ld.gold')
+            if hits:
+                binutils_has_ld_gold = True
+        elif which('ld.gold', on_error=IGNORE):
+            binutils_has_ld_gold = True
+
         # use GOLD as default linker, except on RISC-V (since it's not supported there)
         if get_cpu_family() == RISCV:
             self.configopts += " --disable-gold --enable-ld=default"
         elif self.cfg['use_gold_linker']:
+            if not binutils_has_ld_gold:
+                raise EasyBuildError("Tried to set ld.gold as default linker, but ld.gold is not available.")
             self.configopts += " --enable-gold=default --enable-ld --with-plugin-ld=ld.gold"
         else:
-            self.configopts += " --enable-gold --enable-ld=default"
+            if binutils_has_ld_gold:
+                self.configopts += " --enable-gold"
+            else:
+                self.log.debug("Disabling ld.gold, as is was not found")
+                self.configopts += " --disable-gold"
+            self.configopts += " --enable-ld=default"
 
         # enable bootstrap build for self-containment (unless for staged build)
         if not self.stagedbuild:
@@ -789,6 +808,10 @@ def build_step(self):
                     if lib == "gmp":
                         cmd = "./configure --prefix=%s " % stage2prefix
                         cmd += "--with-pic --disable-shared --enable-cxx "
+                        # Force C99 during configure to avoid newer C standard
+                        # being used. This avoids inconsistencies between the configure
+                        # result and the build, where we force C99 via a patch.
+                        cmd += "CFLAGS=-std=c99 "
 
                         # ensure generic build when 'generic' is set to True or when --optarch=GENERIC is used
                         # non-generic build can be enforced with generic=False if --optarch=GENERIC is used