pyrox.dev
Merge pull request #40040 from obsidiansystems/gnu-config-arm
gnu-config: Update, allowing hacks to be removed
authored by John Ericson and committed by GitHub d00cc124 8e891e6e
+1
-5
pkgs/development/compilers/gcc/4.8/default.nix
+1
-5
pkgs/development/compilers/gcc/4.8/default.nix
···
272
dontDisableStatic = true;
273
274
# TODO(@Ericson2314): Always pass "--target" and always prefix.
275
-
configurePlatforms =
276
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
277
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
278
-
then []
279
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
280
281
configureFlags =
282
# Basic dependencies
+1
-5
pkgs/development/compilers/gcc/4.9/default.nix
+1
-5
pkgs/development/compilers/gcc/4.9/default.nix
···
295
dontDisableStatic = true;
296
297
# TODO(@Ericson2314): Always pass "--target" and always prefix.
298
-
configurePlatforms =
299
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
300
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
301
-
then []
302
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
303
304
configureFlags =
305
# Basic dependencies
+1
-5
pkgs/development/compilers/gcc/5/default.nix
+1
-5
pkgs/development/compilers/gcc/5/default.nix
···
301
dontDisableStatic = true;
302
303
# TODO(@Ericson2314): Always pass "--target" and always prefix.
304
-
configurePlatforms =
305
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
306
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
307
-
then []
308
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
309
310
configureFlags =
311
# Basic dependencies
+1
-5
pkgs/development/compilers/gcc/6/default.nix
+1
-5
pkgs/development/compilers/gcc/6/default.nix
···
305
dontDisableStatic = true;
306
307
# TODO(@Ericson2314): Always pass "--target" and always prefix.
308
-
configurePlatforms =
309
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
310
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
311
-
then []
312
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
313
314
configureFlags =
315
# Basic dependencies
+1
-5
pkgs/development/compilers/gcc/7/default.nix
+1
-5
pkgs/development/compilers/gcc/7/default.nix
···
270
dontDisableStatic = true;
271
272
# TODO(@Ericson2314): Always pass "--target" and always prefix.
273
-
configurePlatforms =
274
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
275
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
276
-
then []
277
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
278
279
configureFlags =
280
# Basic dependencies
+1
-5
pkgs/development/compilers/gcc/8/default.nix
+1
-5
pkgs/development/compilers/gcc/8/default.nix
···
265
dontDisableStatic = true;
266
267
# TODO(@Ericson2314): Always pass "--target" and always prefix.
268
-
configurePlatforms =
269
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
270
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
271
-
then []
272
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
273
274
configureFlags =
275
# Basic dependencies
+1
-5
pkgs/development/compilers/gcc/snapshot/default.nix
+1
-5
pkgs/development/compilers/gcc/snapshot/default.nix
···
233
dontDisableStatic = true;
234
235
# TODO(@Ericson2314): Always pass "--target" and always prefix.
236
-
configurePlatforms =
237
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
238
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
239
-
then []
240
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
241
242
configureFlags =
243
# Basic dependencies
+3
-3
pkgs/development/libraries/gnu-config/default.nix
+3
-3
pkgs/development/libraries/gnu-config/default.nix
···
1
{ stdenv, fetchurl }:
2
3
let
4
-
rev = "6a82322dd05cdc57b4cd9f7effdf1e2fd6f7482b";
5
6
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
7
configGuess = fetchurl {
8
url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
9
-
sha256 = "1yj9yi94h7z4z6jzickddv64ksz1aq5kj0c7krgzjn8xf8p3avmh";
10
};
11
configSub = fetchurl {
12
url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
13
-
sha256 = "1qsqdpla6icbzskkk7v3zxrpzlpqlc94ny9hyy5wh5lm5rwwfvb7";
14
};
15
in
16
stdenv.mkDerivation rec {
···
1
{ stdenv, fetchurl }:
2
3
let
4
+
rev = "b75cdc942a6172f63b34faf642b8c797239f6776";
5
6
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
7
configGuess = fetchurl {
8
url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
9
+
sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
10
};
11
configSub = fetchurl {
12
url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
13
+
sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
14
};
15
in
16
stdenv.mkDerivation rec {
+1
-5
pkgs/development/tools/misc/binutils/default.nix
+1
-5
pkgs/development/tools/misc/binutils/default.nix
···
104
else "-static-libgcc";
105
106
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
107
-
configurePlatforms =
108
-
# TODO(@Ericson2314): Figure out what's going wrong with Arm
109
-
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
110
-
then []
111
-
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
112
113
configureFlags = [
114
"--enable-targets=all" "--enable-64-bit-bfd"
+4
-4
pkgs/stdenv/linux/default.nix
+4
-4
pkgs/stdenv/linux/default.nix
···
249
};
250
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
251
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
252
-
lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook;
253
})
254
255
···
290
};
291
extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
292
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
293
-
lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook;
294
})
295
296
# Construct the final stdenv. It uses the Glibc and GCC, and adds
···
322
323
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
324
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
325
-
lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook;
326
327
cc = prevStage.gcc;
328
···
356
++ [ /*propagated from .dev*/ linuxHeaders
357
binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
358
]
359
-
++ lib.optionals localSystem.isAarch64
360
[ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
361
362
overrides = self: super: {
···
249
};
250
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
251
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
252
+
lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook;
253
})
254
255
···
290
};
291
extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
292
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
293
+
lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook;
294
})
295
296
# Construct the final stdenv. It uses the Glibc and GCC, and adds
···
322
323
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
324
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
325
+
lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook;
326
327
cc = prevStage.gcc;
328
···
356
++ [ /*propagated from .dev*/ linuxHeaders
357
binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
358
]
359
+
++ lib.optionals (!localSystem.isx86)
360
[ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
361
362
overrides = self: super: {