Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gcc: fix Hydra builds for bootstrapTools.mips64el-linux-gnuabin32 #185284

Merged
merged 3 commits into from Aug 16, 2022
Merged

gcc: fix Hydra builds for bootstrapTools.mips64el-linux-gnuabin32 #185284

merged 3 commits into from Aug 16, 2022

Commits on Aug 5, 2022

  1. gcc: add linkLib32toLib to create lib32->lib links 

    Our gcc builder creates lib64->lib links to ensure that the "primary"
libraries for the targetPlatform wind up in $PREFIX/lib.  This is
required in order for make-bootstrap-files.nix to work correctly.

On mips, gcc follows the somewhat awkward IRIX convention of putting
mips32 binaries in `lib` and mips64n32 binaries in `lib32`.  So we
need similar symlinks there.  This may come up on other ILP32
platforms as well, so a general-purpose variable name is provided.
    Adam Joseph committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    cbc80ff View commit details
    Browse the repository at this point in the history

  2. gcc: do not create lib64->lib links on mips64n32 

    On mips, gcc follows the somewhat awkward IRIX convention of putting
mips64 binaries in `lib64` and mips64n32 binaries in `lib32`.  So on
mips64n32 we do not want the `lib64` symlinks.
    Adam Joseph committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    dfba0bf View commit details
    Browse the repository at this point in the history

  3. gcc: factor out $linkLib64toLib, move it from bash to nix 

    This commit factors out the conditional which creates the `lib64->lib`
symlink in the `preInstall` phase, and calculates its value in nix
code rather than bash code so touching it doesn't cause a global
rebuild on every platform.
    Adam Joseph committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    a6daffb View commit details
    Browse the repository at this point in the history