diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-26 20:20:37 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:55:32 -0400 |
| commit | f472dd7652c22a848670b419b9d8d45ee174dd48 (patch) | |
| tree | 00873f5d159914d86fa7a90eb501534df33c7579 /pkgs/development/compilers/gcc/6/default.nix | |
| parent | 29db8170036d3e6a04ad6d77c62ec1050e50f6fb (diff) | |
| download | nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.tar nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.tar.gz nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.tar.bz2 nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.tar.lz nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.tar.xz nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.tar.zst nixpkgs-f472dd7652c22a848670b419b9d8d45ee174dd48.zip | |
Revert "Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception""
And there's more reverts too. The previous commmit d838afbc9376bdadb8c690eb00b425f3eeccdf2d to gnu-config finally solves it! This reverts commit 3ed545ab31146e607c57649936c75869d6aa9ba2.
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 29f2bad7eac..67b7cf61c5a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -315,11 +315,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies |