Commit ebc9b161 authored by John Ericson's avatar John Ericson
Browse files

gcc: Add `configurePlatforms` exception for Arm 32 

...just as we did for binutils. When the underlying issue is resolved
(probably with a configure script patch or lib/systems/parse.nix
change), this should be reverted.
parent 71186e73

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

+6 −1
Original line number Diff line number Diff line
@@ -231,7 +231,12 @@ stdenv.mkDerivation ({ 
    ;



  # TODO(@Ericson2314): Always pass "--target" and always prefix.

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

  configurePlatforms =

    # TODO(@Ericson2314): Figure out what's going wrong with Arm

    if hostPlatform == targetPlatform && targetPlatform.isArm32

    then []

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



  configureFlags = "

    ${if enableMultilib then "" else "--disable-multilib"}

    ${if enableShared then "" else "--disable-shared"}

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

+6 −1
Original line number Diff line number Diff line
@@ -317,7 +317,12 @@ stdenv.mkDerivation ({ 
  dontDisableStatic = true;



  # TODO(@Ericson2314): Always pass "--target" and always prefix.

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

  configurePlatforms =

    # TODO(@Ericson2314): Figure out what's going wrong with Arm

    if hostPlatform == targetPlatform && targetPlatform.isArm32

    then []

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



  configureFlags = "

    ${if hostPlatform.isSunOS then

      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +

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

+6 −1
Original line number Diff line number Diff line
@@ -317,7 +317,12 @@ stdenv.mkDerivation ({ 
  dontDisableStatic = true;



  # TODO(@Ericson2314): Always pass "--target" and always prefix.

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

  configurePlatforms =

    # TODO(@Ericson2314): Figure out what's going wrong with Arm

    if hostPlatform == targetPlatform && targetPlatform.isArm32

    then []

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



  configureFlags = "

    ${if hostPlatform.isSunOS then

      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +

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

+6 −1
Original line number Diff line number Diff line
@@ -334,7 +334,12 @@ stdenv.mkDerivation ({ 
  dontDisableStatic = true;



  # TODO(@Ericson2314): Always pass "--target" and always prefix.

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

  configurePlatforms =

    # TODO(@Ericson2314): Figure out what's going wrong with Arm

    if hostPlatform == targetPlatform && targetPlatform.isArm32

    then []

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



  configureFlags = "

    ${if hostPlatform.isSunOS then

      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +

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

+6 −1
Original line number Diff line number Diff line
@@ -326,7 +326,12 @@ stdenv.mkDerivation ({ 
  dontDisableStatic = true;



  # TODO(@Ericson2314): Always pass "--target" and always prefix.

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

  configurePlatforms =

    # TODO(@Ericson2314): Figure out what's going wrong with Arm

    if hostPlatform == targetPlatform && targetPlatform.isArm32

    then []

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



  configureFlags = "

    ${if hostPlatform.isSunOS then

      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +