diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-10-17 16:44:24 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-13 08:46:15 -0500 |
| commit | f8741c38cd546e3ff18ce9d708de14ff2aae68ab (patch) | |
| tree | 546f011544ce9833d95ef7d20993efd73c9d020e /pkgs/development/tools/misc/gdb | |
| parent | e65259f00cee799a6640a7ef5100f2bce3cb9d6f (diff) | |
| download | nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.tar nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.tar.gz nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.tar.bz2 nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.tar.lz nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.tar.xz nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.tar.zst nixlib-f8741c38cd546e3ff18ce9d708de14ff2aae68ab.zip | |
binutils, gdb: Do not expose libbfd or libopcodes, and be multitarget
There are separate derivations for these libraries and we don't want conflict. Multitarget is generally more useful, and will eventually speed up cross builds, so why not?!
Diffstat (limited to 'pkgs/development/tools/misc/gdb')
| -rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 6ecc6bc0e52f..d1148ad48d82 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo, zlib -, dejagnu, perl, pkgconfig +{ stdenv + +# Build time +, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs + +# Run time +, ncurses, readline, gmp, mpfr, expat, zlib, dejagnu , buildPlatform, hostPlatform, targetPlatform , pythonSupport ? hostPlatform == buildPlatform && !hostPlatform.isCygwin, python ? null , guile ? null -# Support all known targets in one gdb binary. -, multitarget ? false - # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null -, setupDebugInfoDirs }: let @@ -58,10 +59,16 @@ stdenv.mkDerivation rec { configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = with stdenv.lib; [ - "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" - "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" - ] ++ stdenv.lib.optional (!pythonSupport) "--without-python" - ++ stdenv.lib.optional multitarget "--enable-targets=all"; + "--enable-targets=all" "--enable-64-bit-bfd" + "--disable-install-libbfd" + "--disable-shared" "--enable-static" + "--with-system-zlib" + "--with-system-readline" + + "--with-gmp=${gmp.dev}" + "--with-mpfr=${mpfr.dev}" + "--with-expat" "--with-libexpat-prefix=${expat.dev}" + ] ++ stdenv.lib.optional (!pythonSupport) "--without-python"; postInstall = '' # Remove Info files already provided by Binutils and other packages. |