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/development/compilers/go | |
parent | 2b0b63c22986f0465fd5cee3772f18335f34c845 (diff) | |
download | nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.gz nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.bz2 nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.lz nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.xz nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.zst nixlib-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.zip |
treewide: rename llvm-dsymutil to dsymutil
This is a change introduced between llvm 5 and llvm 7.
Diffstat (limited to 'pkgs/development/compilers/go')
-rw-r--r-- | pkgs/development/compilers/go/1.10.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/go/1.11.nix | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 5dce1529a8b8..5d571e03bd4d 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 1e3a63983f4a..ec22e4531404 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. |