Merge pull request #33641 from dhess/gcc-armv7l-fix

Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception"
This commit is contained in:
Orivej Desh
2018-01-09 12:18:43 +00:00
committed by GitHub
8 changed files with 40 additions and 8 deletions

View File

@@ -91,7 +91,11 @@ stdenv.mkDerivation rec {
else "-static-libgcc";
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
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";
configureFlags = [
"--enable-targets=all" "--enable-64-bit-bfd"