diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 15b21fcdbeae..3919fbe89f38 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -27,6 +27,7 @@ , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt +, disableGdbPlugin ? !enablePlugin }: # Make sure we get GNU sed. @@ -115,6 +116,7 @@ let majorVersion = "11"; enableLTO enableMultilib enablePlugin + disableGdbPlugin enableShared disableBootstrap fetchpatch diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 10db2adc4166..562d7113b6a2 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -28,6 +28,7 @@ , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt +, disableGdbPlugin ? !enablePlugin }: # Make sure we get GNU sed. @@ -144,6 +145,7 @@ let majorVersion = "12"; cloog crossStageStatic disableBootstrap + disableGdbPlugin enableLTO enableMultilib enablePlugin diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index e3a4aa7cccdf..e0a713bc3853 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -11,6 +11,7 @@ , enableLTO , enableMultilib , enablePlugin +, disableGdbPlugin ? !enablePlugin , enableShared , langC @@ -26,6 +27,7 @@ , disableBootstrap ? stdenv.targetPlatform != stdenv.hostPlatform }: +assert disableGdbPlugin -> !enablePlugin; assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] @@ -172,9 +174,9 @@ let then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ lib.optional (!enableShared) "--disable-shared" - ++ [ - (lib.enableFeature enablePlugin "plugin") - ] + ++ lib.singleton (lib.enableFeature enablePlugin "plugin") + # Libcc1 is the GCC cc1 plugin for the GDB debugger which is only used by gdb + ++ lib.optional disableGdbPlugin "--disable-libcc1" # Support -m32 on powerpc64le/be ++ lib.optional (targetPlatform.system == "powerpc64le-linux")