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

Provide real dsymutil to darwin stdenv #52256

Merged
merged 1 commit into from Dec 18, 2018

Conversation

matthewbauer
Copy link
Member

We were previously using a dummy wrapper for dsymutil. This meant that
debug symbols were not getting generated when dsymutil was otherwise
available. This should fix that issue & provide a real dsymutil from
llvm.

Fixes #52148.

We were previously using a dummy wrapper for dsymutil. This meant that
debug symbols were not getting generated when dsymutil was otherwise
available. This should fix that issue & provide a real dsymutil from
llvm.

Fixes NixOS#52148.
@@ -15,6 +15,7 @@ in
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
inherit (darwin) cctools;
inherit (pkgs) binutils-unwrapped;
inherit (pkgs.llvmPackages_5) llvm;
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure using an explicit version here is a good idea, it's one more thing to keep in sync when updating the default version.

Copy link
Member Author

Choose a reason for hiding this comment

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

For bootstrapping you need it to be llvmPackages_5. Otherwise you would get infinite recursion. I guess we can just rely on llvmPackages = llvmPackages_5 though...

@matthewbauer matthewbauer merged commit 59ec6b5 into NixOS:staging Dec 18, 2018
matthewbauer added a commit that referenced this pull request Dec 30, 2018
These just copy commands from Products/Release/. But with #52256 we
now build .dsym directories that somehow wind up in Products/Release/.
This makes things more exact by just copying the files in Products/Release/.
@matthewbauer matthewbauer deleted the 52148-fix branch February 22, 2019 04:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants