delve: unbreak go version -m dlv (#383098)
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go
|
||||
index 2207708e..a7e8a3c2 100644
|
||||
--- a/cmd/dlv/main.go
|
||||
+++ b/cmd/dlv/main.go
|
||||
@@ -21,6 +21,8 @@ func main() {
|
||||
version.DelveVersion.Build = Build
|
||||
}
|
||||
|
||||
+ os.Setenv("disableHardening", "fortify "+os.Getenv("disableHardening"))
|
||||
+
|
||||
const cgoCflagsEnv = "CGO_CFLAGS"
|
||||
if os.Getenv(cgoCflagsEnv) == "" {
|
||||
os.Setenv(cgoCflagsEnv, "-O0 -g")
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
@@ -17,12 +16,14 @@ buildGoModule rec {
|
||||
hash = "sha256-bp8pYWS3Vpg0R2Xfe5agDTENzLGu9r43BgORa8VrP+Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-fortify.diff
|
||||
];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/dlv" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
preCheck = ''
|
||||
@@ -38,10 +39,6 @@ buildGoModule rec {
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
postInstall = ''
|
||||
# fortify source breaks build since delve compiles with -O0
|
||||
wrapProgram $out/bin/dlv \
|
||||
--prefix disableHardening " " fortify
|
||||
|
||||
# add symlink for vscode golang extension
|
||||
# https://github.com/golang/vscode-go/blob/master/docs/debugging.md#manually-installing-dlv-dap
|
||||
ln $out/bin/dlv $out/bin/dlv-dap
|
||||
|
||||
Reference in New Issue
Block a user