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

bintools: only add macos flags when targeting macOS #83180

Merged
merged 1 commit into from May 13, 2020

Conversation

@matthewbauer
Copy link
Member

matthewbauer commented Mar 23, 2020

We can’t set this for cross-compiling since we use the GNU linker.
Instead, set these flags only when targetPlatform is macOS.

Fixes #80754

Fixes #83141

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
We can’t set this for cross-compiling since we use the GNU linker.
Instead, set these flags only when targetPlatform is macOS.

Fixes #80754

Fixes #83141
@LnL7
LnL7 approved these changes Mar 26, 2020
Copy link
Member

LnL7 left a comment

Not sure if moving these flags here has implications, but seems reasonable.

@lovesegfault
Copy link
Contributor

lovesegfault commented Mar 28, 2020

This should target staging

@LnL7
Copy link
Member

LnL7 commented Mar 28, 2020

When this is good to go I also want to include it in #80890.

@matthewbauer matthewbauer changed the base branch from master to staging Apr 9, 2020
@matthewbauer matthewbauer merged commit d38bad5 into NixOS:staging May 13, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b0b0a06"; rev="b0b0a06788d5a7b3a3b35063b058f1326f10e983"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@angerman
Copy link
Contributor

angerman commented Jun 18, 2020

Can we get this backported into 20.03? @matthewbauer, @Ericson2314?

@LnL7
Copy link
Member

LnL7 commented Jun 18, 2020

@angerman Sounds good, wanted to wait a bit to make sure there's no fallout before backporting but it's in master now so should be good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.