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

build-support/cc-wrapper: revert "pass in non-existent --sysroot= to … #213185

Merged
merged 6 commits into from
Jan 29, 2023
Merged

build-support/cc-wrapper: revert "pass in non-existent --sysroot= to … #213185

merged 6 commits into from
Jan 29, 2023

Commits on Jan 29, 2023

  1. build-support/cc-wrapper: revert "pass in non-existent --sysroot= to … 

    …untangle from libc"

This reverts commit 8c80bd0
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc").

This change was good in spirit: we caught a few genuine problems with
`scons` based packages (`godot`, `fluxus`) and unexpected `-idirafter`
includes in various boot loadres (`ipxe`, wimboot`):

    NixOS#210004 (comment)

Unfortunately `--sysroot=` also has a negative impact on libary search
order for DT_NEEDED libraries and RUNPATHs of linked libraries. This
unexpectedly broke `dmd`, `d-seams`, `llvmPackages_rocm.compiler-rt`).

An interesting case of unexpected breakage is `usbmuxd2` where the bug
exposed incomplete library move on `libstdc++fs` in `gcc`.

The library breakage is very non-intuitive (on top of already unusual
layout of `cc-wrapper` driver). Let's revert this change for now.

Once it lands we can undo `--sysroot=/` workarounds merged for
`staging-next`.
    @trofi
    trofi committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    6b832b5 View commit details
    Browse the repository at this point in the history

  2. wimboot: revert "fix build by fixing -idirafter ordering" 

    This reverts commit 1ad0b9a.

commit 8c80bd0
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
    @trofi
    trofi committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    5d837b2 View commit details
    Browse the repository at this point in the history

  3. dmd: revert "set --sysroot=/ to avoid cc-wrapper value" 

    This reverts commit 7c73d1e.

commit 8c80bd0
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
    @trofi
    trofi committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    e2e400e View commit details
    Browse the repository at this point in the history

  4. ubootTools: revert "fix build by fixing -idirafter ordering" 

    This reverts commit 8b3a31f.

commit 8c80bd0
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
    @trofi
    trofi committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    25206ed View commit details
    Browse the repository at this point in the history

  5. ipxe: revert "fix build by fixing -idirafter ordering" 

    This reverts commit a9e6a5c.

commit 8c80bd0
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
    @trofi
    trofi committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    58ddf90 View commit details
    Browse the repository at this point in the history

  6. mesa: revert "fix build" 

    This reverts commit f4a78e4.

commit 8c80bd0
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
    @trofi
    trofi committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    3f9fe5c View commit details
    Browse the repository at this point in the history