Unverified Commit 9e3b2a58 authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

Merge pull request #226366 from mmlb/rename-gnatboot 

gnatboot: rename to gnat-bootstrap
parents 05a26cee 31d68027

pkgs/build-support/bintools-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ stdenv.mkDerivation { 


    # If we are asked to wrap `gas` and this bintools has it,

    # then symlink it (`as` will be symlinked next).

    # This is mainly for the wrapped gnatboot on x86-64 Darwin,

    # This is mainly for the wrapped gnat-bootstrap on x86-64 Darwin,

    # as it must have both the GNU assembler from cctools (installed as `gas`)

    # and the Clang integrated assembler (installed as `as`).

    # See pkgs/os-specific/darwin/binutils/default.nix for details.

pkgs/development/compilers/gcc/10/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils

, isl ? null # optional, for the Graphite optimization framework.

, zlib ? null

, gnatboot ? null

, gnat-bootstrap ? null

, enableMultilib ? false

, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins

, name ? "gcc"
@@ -34,7 +34,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; 


# The go frontend is written in c++

assert langGo -> langCC;

assert langAda -> gnatboot != null;

assert langAda -> gnat-bootstrap != null;



# threadsCross is just for MinGW

assert threadsCross != {} -> stdenv.targetPlatform.isWindows;
@@ -111,7 +111,7 @@ let majorVersion = "10"; 
        fetchurl

        gettext

        gmp

        gnatboot

        gnat-bootstrap

        gnused

        isl

        langAda

pkgs/development/compilers/gcc/11/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils

, isl ? null # optional, for the Graphite optimization framework.

, zlib ? null

, gnatboot ? null

, gnat-bootstrap ? null

, enableMultilib ? false

, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins

, name ? "gcc"
@@ -37,7 +37,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; 


# The go frontend is written in c++

assert langGo -> langCC;

assert langAda -> gnatboot != null;

assert langAda -> gnat-bootstrap != null;



# threadsCross is just for MinGW

assert threadsCross != {} -> stdenv.targetPlatform.isWindows;
@@ -126,7 +126,7 @@ let majorVersion = "11"; 
        fetchurl

        gettext

        gmp

        gnatboot

        gnat-bootstrap

        gnused

        isl

        langAda

pkgs/development/compilers/gcc/12/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
, isl ? null # optional, for the Graphite optimization framework.

, zlib ? null

, libucontext ? null

, gnatboot ? null

, gnat-bootstrap ? null

, enableMultilib ? false

, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins

, name ? "gcc"
@@ -39,7 +39,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; 


# The go frontend is written in c++

assert langGo -> langCC;

assert langAda -> gnatboot != null;

assert langAda -> gnat-bootstrap != null;



# TODO: fixup D bootstapping, probably by using gdc11 (and maybe other changes).

#   error: GDC is required to build d
@@ -159,7 +159,7 @@ let majorVersion = "12"; 
        fetchurl

        gettext

        gmp

        gnatboot

        gnat-bootstrap

        gnused

        isl

        langAda

pkgs/development/compilers/gcc/6/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils

, isl ? null # optional, for the Graphite optimization framework.

, zlib ? null, boehmgc ? null

, gnatboot ? null

, gnat-bootstrap ? null

, zip ? null, unzip ? null, pkg-config ? null

, gtk2 ? null, libart_lgpl ? null

, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@@ -45,7 +45,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; 
# The go frontend is written in c++

assert langGo -> langCC;



assert langAda -> gnatboot != null;

assert langAda -> gnat-bootstrap != null;



# threadsCross is just for MinGW

assert threadsCross != {} -> stdenv.targetPlatform.isWindows;
@@ -151,7 +151,7 @@ let majorVersion = "6"; 
        flex

        gettext

        gmp

        gnatboot

        gnat-bootstrap

        gnused

        gtk2

        isl