Skip to content

llvm: fix llvm-config on darwin#60912

Merged
FRidh merged 2 commits intoNixOS:staging-nextfrom
LnL7:darwin-llvm-7.1
May 4, 2019
Merged

llvm: fix llvm-config on darwin#60912
FRidh merged 2 commits intoNixOS:staging-nextfrom
LnL7:darwin-llvm-7.1

Conversation

@LnL7
Copy link
Copy Markdown
Member

@LnL7 LnL7 commented May 4, 2019 •
edited
Loading

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.

@LnL7
llvm: fix llvm-config on darwin
eb31e48 
With 7.1 llvm-config looks for libLLVM-7.1.dylib, but the shortVersion
was still 7 so only 7 and 7.1.0 where aliased before.

	$ llvm-config --link-shared
	llvm-config: error: libLLVM-7.1.dylib is missing
@LnL7 LnL7 requested a review from matthewbauer as a code owner May 4, 2019 11:32
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 4, 2019
@LnL7 LnL7 mentioned this pull request May 4, 2019
Merged
10 tasks
@LnL7 LnL7 changed the title [WIP] llvm: fix llvm-config on darwin llvm: fix llvm-config on darwin May 4, 2019
@LnL7
llvm: create all versioned symlinks for libLLVM on darwin
95d751b 
Apply eb31e48 to older versions where applicable.
@LnL7 LnL7 force-pushed the darwin-llvm-7.1 branch from ab1ab76 to 95d751b Compare May 4, 2019 13:49
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label May 4, 2019
@ofborg ofborg bot requested review from 7c6f434c, dtzWill and lovek323 May 4, 2019 14:08
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 4, 2019
@FRidh FRidh merged commit 626a95a into NixOS:staging-next May 4, 2019
@LnL7 LnL7 deleted the darwin-llvm-7.1 branch May 4, 2019 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@lovek323 lovek323 Awaiting requested review from lovek323

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@LnL7 @7c6f434c @FRidh