about summary refs log tree commit diff
path: root/pkgs/development/tools/misc/gdb
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-12-01 17:13:24 -0500
committerJohn Ericson <git@JohnEricson.me>2019-12-01 17:13:24 -0500
commit7ee98d8bb3d0aef5a395ae77f14b3255c2b84909 (patch)
tree3d8d476e552551fda52dba1db70d87a93f50251a /pkgs/development/tools/misc/gdb
parent2c50bd398463bc2e67824dbf094b157b618e8623 (diff)
gdb: Fix safe path for cross
Diffstat (limited to 'pkgs/development/tools/misc/gdb')
-rw-r--r--pkgs/development/tools/misc/gdb/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 335699ee5600e..e125b7418f6b5 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ stdenv, targetPackages
 
 # Build time
 , fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
@@ -8,9 +8,12 @@
 
 , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null
 , guile ? null
-# $debugdir:$datadir/auto-load are whitelisted by default by GDB
-, safePaths ? [ "$debugdir" "$datadir/auto-load" stdenv.cc.cc.lib ]
-
+, safePaths ? [
+   # $debugdir:$datadir/auto-load are whitelisted by default by GDB
+   "$debugdir" "$datadir/auto-load"
+   # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
+   targetPackages.stdenv.cc.cc.lib
+  ]
 }:
 
 let