diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-28 18:15:31 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:22 -0500 |
| commit | 0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0 (patch) | |
| tree | 3763b3a98f5891fa8eec28b5a9023953bff7927a /pkgs/development/compilers/gcc/5 | |
| parent | 9cda2f5559bcbc8ca279521561f6096b35c7f07a (diff) | |
| download | nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.tar nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.tar.gz nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.tar.bz2 nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.tar.lz nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.tar.xz nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.tar.zst nixpkgs-0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.zip | |
gcc, binutils: Get rid of 32-bit ARM configure flag exception
Now that we do `--enable-targes=all`, there is no risk of missing the needed emulation. This reverts commit ebc9b161cd184502bf4912b9348a507e2d0540da. This reverts commit 88efc22b44dedf423398491f9a55d1631b0b50ff.
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 6ccd47c9729..64922d83b50 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -316,11 +316,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 hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies |