Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gcc/common: add disableGdbPlugin option #216237

Merged
merged 1 commit into from Feb 23, 2023
Merged

gcc/common: add disableGdbPlugin option #216237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/development/compilers/gcc/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -115,6 +116,7 @@ let majorVersion = "11";
enableLTO
enableMultilib
enablePlugin
disableGdbPlugin
enableShared
disableBootstrap
fetchpatch
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/compilers/gcc/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -144,6 +145,7 @@ let majorVersion = "12";
cloog
crossStageStatic
disableBootstrap
disableGdbPlugin
enableLTO
enableMultilib
enablePlugin
Expand Down
8 changes: 5 additions & 3 deletions pkgs/development/compilers/gcc/common/configure-flags.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
, enableLTO
, enableMultilib
, enablePlugin
, disableGdbPlugin ? !enablePlugin
, enableShared

, langC
Expand All @@ -26,6 +27,7 @@
, disableBootstrap ? stdenv.targetPlatform != stdenv.hostPlatform
}:

assert disableGdbPlugin -> !enablePlugin;
assert langJava -> lib.versionOlder version "7";

# Note [Windows Exception Handling]
Expand Down Expand Up @@ -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")
Expand Down