git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74806 from Ericson2314/gdb-correct-lib

gdb: Fix safe path for cross

commitce0fd247528247c1368bacc5eff1bf6127120acb authorJohn Ericson <git@JohnEricson.me> dateSun 1 Dec 2019, 17:39 (7 years ago) parent6662f5b7ee98d8
1 file changed+7−4
pkgs/development/tools/misc/gdb/default.nix+7−4
pkgs/development/tools/misc/gdb/default.nix+7−4
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ stdenv, targetPackages
22
33# Build time
44, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
@@ -8,9 +8,12 @@
88
99, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null
1010, guile ? null
11−# $debugdir:$datadir/auto-load are whitelisted by default by GDB
12−, safePaths ? [ "$debugdir" "$datadir/auto-load" stdenv.cc.cc.lib ]
13−
11+, safePaths ? [
12+ # $debugdir:$datadir/auto-load are whitelisted by default by GDB
13+ "$debugdir" "$datadir/auto-load"
14+ # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
15+ targetPackages.stdenv.cc.cc.lib
16+ ]
1417}:
1518
1619let