Skip to content

Comments

llvm_38: update hashes and fix on darwin#15252

Merged
joachifm merged 1 commit intoNixOS:masterfrom
acowley:llvm_38
May 20, 2016
Merged

llvm_38: update hashes and fix on darwin#15252
joachifm merged 1 commit intoNixOS:masterfrom
acowley:llvm_38

Conversation

@acowley
Copy link
Contributor

@acowley acowley commented May 5, 2016

Things done
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux

The hashes for libc++ and libc++abi were wrong.

There was also an incompatibility with nixpkgs on darwin which is now
weakly worked around: the "os_trace" macro changed definition in the OS
X development SDK since version 10.9 as used by nixpkgs. LLVM 3.8 uses
the new version, which I am temporarily replacing with a printf on
darwin as it is only used in one minor location.

Closes #14542

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @andrewrk to be a potential reviewer

@andrewrk
Copy link
Member

andrewrk commented May 5, 2016

Looks good to me.

@joachifm joachifm added the 6.topic: darwin Running or building packages on Darwin label May 6, 2016
@vcunat
Copy link
Member

vcunat commented May 7, 2016

overrideDerivation is (said to) better be avoided in default code. Why not put that conditional phase directly into the source?

@acowley
Copy link
Contributor Author

acowley commented May 7, 2016

I did it this way because it seems to only be a problem for 3.8. Would putting a self version check guarding that patch in the generic llvm.nix be better?

@vcunat
Copy link
Member

vcunat commented May 7, 2016

Yes, but note there is no generic llvm.nix (it would be nice to have IMO) – the whole directory is copied every time.

The hashes for libc++ and libc++abi were wrong.

There was also an incompatibility with nixpkgs on darwin which is now
weakly worked around: the "os_trace" macro changed definition in the OS
X development SDK since version 10.9 as used by nixpkgs. LLVM 3.8 uses
the new version, which I am temporarily replacing with a printf on
darwin as it is only used in one minor location.
@acowley
Copy link
Contributor Author

acowley commented May 10, 2016

Thank you for your patience, @vcunat! I was confused by quickly navigating to the file and inferred too much from its name. I've removed the use of overrideDerivation.

@joachifm
Copy link
Contributor

To be clear, the hashes didn't change, but were always incorrect due to being copied from the 3.7 expression, right?

@vcunat
Copy link
Member

vcunat commented May 20, 2016

Yes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants