Commit 0f5c8046 authored by John Ericson's avatar John Ericson
Browse files

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 ebc9b161.
This reverts commit 88efc22b.
parent 9cda2f55

pkgs/development/compilers/gcc/4.5/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -256,11 +256,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

    then []

    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";



  configureFlags =

    # Basic dependencies

pkgs/development/compilers/gcc/4.8/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -298,11 +298,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

pkgs/development/compilers/gcc/4.9/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -307,11 +307,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

pkgs/development/compilers/gcc/5/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -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

pkgs/development/compilers/gcc/6/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -319,11 +319,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