diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-03 19:55:51 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:50 -0400 |
| commit | 8cabf4d5c56ef23eb79429e087dc702f049e9bfe (patch) | |
| tree | 39d227837a2f15e08929b71fac02a6c28da230ca /pkgs | |
| parent | 2b0b63c22986f0465fd5cee3772f18335f34c845 (diff) | |
| download | nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.gz nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.bz2 nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.lz nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.xz nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.zst nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.zip | |
treewide: rename llvm-dsymutil to dsymutil
This is a change introduced between llvm 5 and llvm 7.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/go/1.10.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.11.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/binutils/default.nix | 2 |
4 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 5dce1529a8b..5d571e03bd4 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -131,11 +131,6 @@ stdenv.mkDerivation rec { }) ]; - postPatch = optionalString stdenv.isDarwin '' - echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" - substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil - ''; - GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.hostPlatform.system == "i686-linux" then "386" diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 1e3a63983f4..ec22e453140 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -136,11 +136,6 @@ stdenv.mkDerivation rec { ./skip-test-extra-files-on-386.patch ]; - postPatch = optionalString stdenv.isDarwin '' - echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" - substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil - ''; - GOOS = stdenv.targetPlatform.parsed.kernel.name; GOARCH = goarch stdenv.targetPlatform; # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 78f40913eb5..9942123a512 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -44,14 +44,8 @@ stdenv.mkDerivation rec { substituteInPlace coregrind/Makefile.in \ --replace /usr/include/mach ${xnu}/include/mach - echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" - find -name "Makefile.in" | while read file; do - substituteInPlace "$file" \ - --replace dsymutil ${llvm}/bin/llvm-dsymutil - done - substituteInPlace coregrind/m_debuginfo/readmacho.c \ - --replace /usr/bin/dsymutil ${llvm}/bin/llvm-dsymutil + --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld" substituteInPlace coregrind/link_tool_exe_darwin.in \ diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 3b5e8f1207a..9f9a0c74724 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - ln -s ${llvm}/bin/llvm-dsymutil $out/bin/dsymutil + ln -s ${llvm}/bin/dsymutil $out/bin/dsymutil ln -s ${binutils-unwrapped.out}/share $out/share |