diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
| commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
| tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/development/compilers/go | |
| parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
| parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
| download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip | |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/go')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/go/1.11.nix | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/go/1.12.nix | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix index db3731c2fcaa..355b2559e98d 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.11.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.11.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell -, buildPackages, targetPackages }: +, buildPackages, pkgsTargetTarget +}: let @@ -152,16 +153,12 @@ stdenv.mkDerivation rec { # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}cc" + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" else null; - CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}c++" + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" else null; diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index d7bbd4eaf0fc..bcd2eacc7ecf 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell -, buildPackages, targetPackages }: +, buildPackages, pkgsTargetTarget +}: let @@ -154,16 +155,12 @@ stdenv.mkDerivation rec { # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}cc" + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" else null; - CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}c++" + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" else null; |