pyrox.dev
Merge pull request #33676 from obsidiansystems/less-arm-hack
gcc, binutils: Narrow down ARM hack so only native builds are affected
authored by John Ericson and committed by GitHub 98b3db2e 01705125
+1
-1
pkgs/development/compilers/gcc/4.5/default.nix
+1
-1
pkgs/development/compilers/gcc/4.5/default.nix
···
258
258
# TODO(@Ericson2314): Always pass "--target" and always prefix.
259
259
configurePlatforms =
260
260
# TODO(@Ericson2314): Figure out what's going wrong with Arm
261
-
if hostPlatform == targetPlatform && targetPlatform.isArm
261
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
262
262
then []
263
263
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
264
264
+1
-1
pkgs/development/compilers/gcc/4.8/default.nix
+1
-1
pkgs/development/compilers/gcc/4.8/default.nix
···
300
300
# TODO(@Ericson2314): Always pass "--target" and always prefix.
301
301
configurePlatforms =
302
302
# TODO(@Ericson2314): Figure out what's going wrong with Arm
303
-
if hostPlatform == targetPlatform && targetPlatform.isArm
303
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
304
304
then []
305
305
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
306
306
+1
-1
pkgs/development/compilers/gcc/4.9/default.nix
+1
-1
pkgs/development/compilers/gcc/4.9/default.nix
···
309
309
# TODO(@Ericson2314): Always pass "--target" and always prefix.
310
310
configurePlatforms =
311
311
# TODO(@Ericson2314): Figure out what's going wrong with Arm
312
-
if hostPlatform == targetPlatform && targetPlatform.isArm
312
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
313
313
then []
314
314
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
315
315
+1
-1
pkgs/development/compilers/gcc/5/default.nix
+1
-1
pkgs/development/compilers/gcc/5/default.nix
···
318
318
# TODO(@Ericson2314): Always pass "--target" and always prefix.
319
319
configurePlatforms =
320
320
# TODO(@Ericson2314): Figure out what's going wrong with Arm
321
-
if hostPlatform == targetPlatform && targetPlatform.isArm
321
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
322
322
then []
323
323
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
324
324
+1
-1
pkgs/development/compilers/gcc/6/default.nix
+1
-1
pkgs/development/compilers/gcc/6/default.nix
···
321
321
# TODO(@Ericson2314): Always pass "--target" and always prefix.
322
322
configurePlatforms =
323
323
# TODO(@Ericson2314): Figure out what's going wrong with Arm
324
-
if hostPlatform == targetPlatform && targetPlatform.isArm
324
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
325
325
then []
326
326
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
327
327
+1
-1
pkgs/development/compilers/gcc/7/default.nix
+1
-1
pkgs/development/compilers/gcc/7/default.nix
···
314
314
# TODO(@Ericson2314): Always pass "--target" and always prefix.
315
315
configurePlatforms =
316
316
# TODO(@Ericson2314): Figure out what's going wrong with Arm
317
-
if hostPlatform == targetPlatform && targetPlatform.isArm
317
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
318
318
then []
319
319
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
320
320
+1
-1
pkgs/development/compilers/gcc/snapshot/default.nix
+1
-1
pkgs/development/compilers/gcc/snapshot/default.nix
···
301
301
# TODO(@Ericson2314): Always pass "--target" and always prefix.
302
302
configurePlatforms =
303
303
# TODO(@Ericson2314): Figure out what's going wrong with Arm
304
-
if hostPlatform == targetPlatform && targetPlatform.isArm
304
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
305
305
then []
306
306
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
307
307
+1
-1
pkgs/development/tools/misc/binutils/default.nix
+1
-1
pkgs/development/tools/misc/binutils/default.nix
···
93
93
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
94
94
configurePlatforms =
95
95
# TODO(@Ericson2314): Figure out what's going wrong with Arm
96
-
if hostPlatform == targetPlatform && targetPlatform.isArm
96
+
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
97
97
then []
98
98
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
99
99