diff options
| author | John Ericson <git@JohnEricson.me> | 2019-12-01 17:39:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 17:39:06 -0500 |
| commit | ce0fd247528247c1368bacc5eff1bf6127120acb (patch) | |
| tree | 1fbf84072216d96044c7e78523a2274f196ffb04 | |
| parent | 6662f5be2d0eefb297c420f3b092465a498f465b (diff) | |
| parent | 7ee98d8bb3d0aef5a395ae77f14b3255c2b84909 (diff) | |
| download | nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.tar nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.tar.gz nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.tar.bz2 nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.tar.lz nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.tar.xz nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.tar.zst nixlib-ce0fd247528247c1368bacc5eff1bf6127120acb.zip | |
Merge pull request #74806 from Ericson2314/gdb-correct-lib
gdb: Fix safe path for cross
| -rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 11 |
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 335699ee5600..e125b7418f6b 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 |