Skip to content

Commit

Permalink
Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception"
Browse files Browse the repository at this point in the history
This commit breaks native armv7l-linux builds. Revert it until it can
be root-caused. This reversion does not affect other platforms or
cross-compiling.

This reverts commit 0f5c804.
  • Loading branch information
dhess committed Jan 9, 2018
1 parent b195d8a commit 3ed545a
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 8 deletions.
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/4.5/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/4.8/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/4.9/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/5/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/6/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/7/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/compilers/gcc/snapshot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,11 @@ 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.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

configureFlags =
# Basic dependencies
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/tools/misc/binutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 3ed545a

Please sign in to comment.