Skip to content

Use the new LLVM cmake paths #1331

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
Feb 17, 2016
Merged

Conversation

compnerd
Copy link
Member

Update the paths that we look in for the cmake modules from LLVM which changed
recently on SVN trunk. Check the old paths first, and if that fails, check the
new path. This permits building against either layout.

Update the paths that we look in for the cmake modules from LLVM which changed
recently on SVN trunk.  Check the old paths first, and if that fails, check the
new path.  This permits building against either layout.
@gottesmm
Copy link
Contributor

@compnerd We use a stable LLVM branch. Is the change you are talking about in our stable branch? Or I guess this is supposed to make it so that swift works with ToT llvm/the stable branch?

@gottesmm
Copy link
Contributor

From talking with @compnerd, this fix makes it so that swift will work with the newer llvm and the current stable llvm.

This will just save me work in the stable branch.

@swift-ci Please test

@gottesmm
Copy link
Contributor

Looks like we are hitting some sort of unable to find XCTest failure on Linux?! Checking if trunk is red... sigh.

@gottesmm
Copy link
Contributor

Both of these failures are due to a broken trunk. I feel comfortable merging this.

gottesmm added a commit that referenced this pull request Feb 17, 2016
Use the new LLVM cmake paths
@gottesmm gottesmm merged commit 0a8eca1 into swiftlang:master Feb 17, 2016
@compnerd compnerd deleted the cmake-path branch July 3, 2016 17:09
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.

2 participants