public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: rename llvm-dsymutil to dsymutil

Browse Source 
This is a change introduced between llvm 5 and llvm 7.
This commit is contained in:
Matthew Bauer
2019-03-03 19:55:51 -05:00
parent 2b0b63c229
commit 8cabf4d5c5
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/go/1.10.nix
View File

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

5
pkgs/development/compilers/go/1.11.nix
View File

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