Merge pull request #40040 from obsidiansystems/gnu-config-arm

gnu-config: Update, allowing hacks to be removed
2018-05-14 11:20:09 -04:00
parent 8e891e6ed4 f2b575bd7b
commit d00cc1242f
10 changed files with 15 additions and 47 deletions
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -305,11 +305,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