pyrox.dev / nixpkgs
lol
fork atom

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

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