diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-29 11:55:23 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-29 13:43:00 +0100 |
| commit | d135422009991d9fb7602892abf77dcdb1e42cad (patch) | |
| tree | 41c1342e3c92eca87d67cc9e46a2e49cade60795 /pkgs/stdenv/adapters.nix | |
| parent | 5cc92eb0d8b859b76b6f3ce0900a5e51af81d49f (diff) | |
| download | nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.tar nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.tar.gz nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.tar.bz2 nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.tar.lz nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.tar.xz nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.tar.zst nixlib-d135422009991d9fb7602892abf77dcdb1e42cad.zip | |
Remove obsolete useKlibc stdenv adapter
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 2f1db703ed23..e2561258b7d6 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -29,33 +29,6 @@ rec { overrideSetup = stdenv: setupScript: stdenv.override { inherit setupScript; }; - # Return a modified stdenv that uses klibc to create small - # statically linked binaries. - useKlibc = stdenv: klibc: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = "-static"; - - # These are added *after* the command-line flags, so we'll - # always optimise for size. - NIX_CFLAGS_COMPILE = - args.NIX_CFLAGS_COMPILE or "" + " -Os -s"; - - configureFlags = - args.configureFlags or "" + " --disable-shared"; # brrr... - - NIX_GCC = pkgs.runCommand "klibc-wrapper" {} '' - mkdir -p $out/bin - ln -s ${klibc}/bin/klcc $out/bin/gcc - ln -s ${klibc}/bin/klcc $out/bin/cc - mkdir -p $out/nix-support - echo 'PATH=$PATH:${stdenv.gcc.binutils}/bin' > $out/nix-support/setup-hook - ''; - }); - isKlibc = true; - isStatic = true; - }; - - # Return a modified stdenv that tries to build statically linked # binaries. makeStaticBinaries = stdenv: stdenv // |