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 commitebc9b161cd. This reverts commit88efc22b44.
This commit is contained in:
@@ -256,11 +256,7 @@ stdenv.mkDerivation ({
|
|||||||
;
|
;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -298,11 +298,7 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -307,11 +307,7 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -316,11 +316,7 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -319,11 +319,7 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -312,11 +312,7 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -299,11 +299,7 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 =
|
configureFlags =
|
||||||
# Basic dependencies
|
# Basic dependencies
|
||||||
|
|||||||
@@ -91,11 +91,7 @@ stdenv.mkDerivation rec {
|
|||||||
else "-static-libgcc";
|
else "-static-libgcc";
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
|
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
|
||||||
configurePlatforms =
|
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
# 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 = [
|
configureFlags = [
|
||||||
"--enable-targets=all" "--enable-64-bit-bfd"
|
"--enable-targets=all" "--enable-64-bit-bfd"
|
||||||
|
|||||||
Reference in New Issue
Block a user