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.

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

Fix macOS tests with meson #11527

Merged
merged 4 commits into from
Sep 18, 2024
Merged

Fix macOS tests with meson #11527

merged 4 commits into from
Sep 18, 2024

Commits on Sep 17, 2024

  1. Configuration menu
    Copy the full SHA
    98db531 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a20659f View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Always initialize curl in parent process on darwin

    Because of an objc quirk[1], calling curl_global_init for the first time
    after fork() will always result in a crash.
    Up until now the solution has been to set
    OBJC_DISABLE_INITIALIZE_FORK_SAFETY for every nix process to ignore
    that error.
    This is less than ideal because we were setting it in package.nix,
    which meant that running nix tests locally would fail because
    that variable was not set.
    Instead of working around that error we address it at the core -
    by calling curl_global_init inside initLibStore, which should mean
    curl will already have been initialized by the time we try to do so in
    a forked process.
    
    [1] https://github.com/apple-oss-distributions/objc4/blob/01edf1705fbc3ff78a423cd21e03dfc21eb4d780/runtime/objc-initialize.mm#L614-L636
    
    (cherry-picked and adapted from https://git.lix.systems/lix-project/lix/commit/c7d97802e4f59b8621e67cf62275d6a7fde8fe62)
    nrabulinski authored and Mic92 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    8105307 View commit details
    Browse the repository at this point in the history
  2. devShell: increase priority of clang-tools

    Before we would get the unwrapped version of clang-tools from clang
    itself, which doesn't quite work.
    Mic92 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    2b76426 View commit details
    Browse the repository at this point in the history