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

netbsd.mkDerivation: fix darwin build #59278

Merged
merged 2 commits into from Apr 11, 2019
Merged

netbsd.mkDerivation: fix darwin build #59278

merged 2 commits into from Apr 11, 2019

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Apr 10, 2019

Fixes build of netbsd.make on darwin

Fixes: aab8c7b ('netbsd: add cross target')
Resolves: #59141

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl
netbsd.mkDerivation: fix darwin build
1548084 
Fixes build of netbsd.make on darwin

Fixes: aab8c7b ('netbsd: add cross target')
@veprbl
netbsd.mkDerivation: don't supply -z relro
81ab32e 
Fixes netbsd.locale

Fixes: aab8c7b ('netbsd: add cross target')
matthewbauer
matthewbauer reviewed Apr 10, 2019
View reviewed changes
pkgs/os-specific/bsd/netbsd/default.nix
@@ -51,7 +51,7 @@ let

AR = "${stdenv'.cc.targetPrefix or ""}ar";
CC = "${stdenv'.cc.targetPrefix or ""}cc";
CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp";
CPP = "${stdenv'.cc.targetPrefix or ""}cpp";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ericson2314 should cpp be prefixed? I feel like it is one case where we don't want the prefixed one. Everyone target could use the same cpp.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know much about cross stuff, but I think cpp knows about the target to be able to define macros like __i386__ and such (e.g. https://github.com/openbsd/src/blob/master/libexec/tradcpp/config.h)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just safer to prefix

@matthewbauer
Copy link
Member

Thanks for working on this!

@matthewbauer matthewbauer merged commit 51be4c6 into NixOS:master Apr 11, 2019
@dhruvio dhruvio mentioned this pull request Apr 12, 2019
Closed
@veprbl veprbl deleted the pr/netbsd_darwin_fix branch December 1, 2020 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

@Ericson2314 Ericson2314 Ericson2314 left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@veprbl @matthewbauer @Ericson2314 @GrahamcOfBorg