treewide: rename llvm-dsymutil to dsymutil

This is a change introduced between llvm 5 and llvm 7.
wip/yesman
Matthew Bauer 5 years ago
parent 2b0b63c229
commit 8cabf4d5c5
  1. 5
      pkgs/development/compilers/go/1.10.nix
  2. 5
      pkgs/development/compilers/go/1.11.nix
  3. 8
      pkgs/development/tools/analysis/valgrind/default.nix
  4. 2
      pkgs/os-specific/darwin/binutils/default.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"

@ -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.

@ -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 \

@ -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

Loading…
Cancel
Save