Merge pull request #216136 from amjoseph-nixpkgs/pr/gcc/enableBootstrap

gcc: expose --disable-bootstrap as disableBootstrap
This commit is contained in:
Sergei Trofimovich
2023-02-18 08:51:38 +00:00
committed by GitHub
3 changed files with 6 additions and 1 deletions
@@ -48,6 +48,7 @@ with builtins;
let majorVersion = "11";
version = "${majorVersion}.3.0";
disableBootstrap = !(with stdenv; targetPlatform == hostPlatform && hostPlatform == buildPlatform);
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -115,6 +116,7 @@ let majorVersion = "11";
enableMultilib
enablePlugin
enableShared
disableBootstrap
fetchpatch
fetchurl
gettext
@@ -53,6 +53,7 @@ with builtins;
let majorVersion = "12";
version = "${majorVersion}.2.0";
disableBootstrap = !(with stdenv; targetPlatform == hostPlatform && hostPlatform == buildPlatform);
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -142,6 +143,7 @@ let majorVersion = "12";
buildPackages
cloog
crossStageStatic
disableBootstrap
enableLTO
enableMultilib
enablePlugin
@@ -23,6 +23,7 @@
, langObjC
, langObjCpp
, langJit
, disableBootstrap ? stdenv.targetPlatform != stdenv.hostPlatform
}:
assert langJava -> lib.versionOlder version "7";
@@ -214,7 +215,7 @@ let
# TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc
++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; })
++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
++ lib.optional disableBootstrap "--disable-bootstrap"
# Platform-specific flags
++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"