Skip to content

Try explicit version number first #49

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

Merged
merged 1 commit into from
Jan 22, 2017
Merged

Try explicit version number first #49

merged 1 commit into from
Jan 22, 2017

Conversation

kofigumbs
Copy link
Contributor

That didn't take long at all. Were y'all thinking of something more complex?

Iteration on #47

@@ -58,7 +58,7 @@ func makeFile() throws {
let cllvmPath = pkgConfigDir.appendingPathComponent("cllvm.pc")

/// Ensure we have llvm-config in the PATH
guard let llvmConfig = which("llvm-config") else {
guard let llvmConfig = which("llvm-config-3.9") ?? which("llvm-config") else {
Copy link
Member

Choose a reason for hiding this comment

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

Other way 'round please.

Copy link
Contributor Author

@kofigumbs kofigumbs Jan 22, 2017

Choose a reason for hiding this comment

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

I got the opposite impression from this comment, so I'm just double checking...

Copy link
Member

Choose a reason for hiding this comment

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

Oh, well. I trust Harlan's judgement here.

@CodaFi
Copy link
Member

CodaFi commented Jan 22, 2017

Thank you kindly for the contribution (and for putting up with me through review).

⛵️

@CodaFi CodaFi merged commit 2b0eefb into llvm-swift:master Jan 22, 2017
@kofigumbs kofigumbs deleted the fix-pkgcfg-linux branch January 22, 2017 01:06
@harlanhaskins
Copy link
Member

harlanhaskins commented Jan 22, 2017 via email

@harlanhaskins
Copy link
Member

Thanks @hkgumbs!

Alright, to clarify.

On some systems, the default LLVM installation installs to llvm-config-3.9 with no symlink at all. On macOS, we don't really have this problem.

Were we to use llvm-config first, then if it was symlinked to <3.9, it would fail after it resolved successfully, and 3.9 wouldn't be tried.

So this is correct!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants