diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-09 17:25:49 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-09 17:25:49 -0500 |
| commit | c98e6b67710c7c04ddab56cb09a14540e6668dbc (patch) | |
| tree | e3769c7a08d90c41612e30d19b58dbddb3ce9bd1 /pkgs/development/compilers/gcc/6/default.nix | |
| parent | c3052295fa1285a3192c549961eba467baee15eb (diff) | |
| download | nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.tar nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.tar.gz nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.tar.bz2 nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.tar.lz nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.tar.xz nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.tar.zst nixpkgs-c98e6b67710c7c04ddab56cb09a14540e6668dbc.zip | |
gcc, binutils: Narrow down ARM hack so only native builds are affected
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 96d88d3085b..2614e96e1b7 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -321,7 +321,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; |