Unverified Commit 2858ab13 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

zig: fix performance issue (#460192)

parents 46477d80 fcafa714

pkgs/development/compilers/zig/bintools.nix

+1 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  zig,

  runCommand,

  makeWrapper,

  coreutils,

}:

let

  targetPrefix = lib.optionalString (
@@ -30,8 +29,7 @@ runCommand "zig-bintools-${zig.version}" 
    for tool in ar objcopy ranlib ld.lld; do

      makeWrapper "$zig/bin/zig" "$out/bin/$tool" \

        --add-flags "$tool" \

        --suffix PATH : "${lib.makeBinPath [ coreutils ]}" \

        --run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"

        --run "export ZIG_GLOBAL_CACHE_DIR=\$TMPDIR/zig-cache"

    done



    ln -s $out/bin/ld.lld $out/bin/ld

pkgs/development/compilers/zig/cc.nix

+1 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  zig,

  stdenv,

  makeWrapper,

  coreutils,

}:

let

  targetPrefix = lib.optionalString (
@@ -34,8 +33,7 @@ runCommand "zig-cc-${zig.version}" 
    for tool in cc c++ ld.lld; do

      makeWrapper "$zig/bin/zig" "$out/bin/$tool" \

        --add-flags "$tool" \

        --suffix PATH : "${lib.makeBinPath [ coreutils ]}" \

        --run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"

        --run "export ZIG_GLOBAL_CACHE_DIR=\$TMPDIR/zig-cache"

    done



    ln -s $out/bin/c++ $out/bin/clang++

pkgs/development/compilers/zig/passthru.nix

+1 −4
Original line number Diff line number Diff line
@@ -22,10 +22,7 @@ 
    nixSupport.cc-cflags = [

      "-target"

      "${stdenv.targetPlatform.system}-${stdenv.targetPlatform.parsed.abi.name}"

    ]

    ++ lib.optional (

      stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)

    ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";

    ];

  };



  stdenv = overrideCC stdenv zig.cc;