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

Fix Chapel-LLVM build with LLVM master #13404

Merged
merged 4 commits into from
Jul 29, 2019

Conversation

mppf
Copy link
Member

@mppf mppf commented Jul 9, 2019

Update Makefiles to support LLVM 9 and 10

Resolves a build-time error. Since the list of libraries we need to work with clang changed, add some Makefile logic to track the LLVM major version number.

Do not force full LLVM rebuild when relevant Makefiles change

Since PR #7004, we have been rebuilding third-party libraries
when relevant Makefiles change. This has also applied to LLVM
builds since #12102.

However, this presents challenges to developers modifying these
Makefiles since the LLVM build can take more than 10 minutes.

At the same time, LLVM's cmake-based build system should generally manage
dependencies (and for example, do a rebuild if we try to make install
after upgrading all of the source code files).

Therefore, this commit adjusts the 3p-rebuild for LLVM to only
remove the install directory and to let LLVM's cmake manage the
build directory.

Reviewed by @dmk42 - thanks!

Passed full local --llvm testing.

@mppf mppf force-pushed the fix-llvm-build-master branch from af216e4 to a5fc04b Compare July 24, 2019 00:34
@mppf mppf requested a review from dmk42 July 24, 2019 03:01
Copy link
Contributor

@dmk42 dmk42 left a comment

Choose a reason for hiding this comment

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

Looks good. Just one question about version specifics.

mppf added 4 commits July 29, 2019 13:59
Since PR chapel-lang#7004, we have been rebuilding third-party libraries
when relevant Makefiles change. This has also applied to LLVM
builds since chapel-lang#12102.

However, this presents challenges to developers modifying these
Makefiles since the LLVM build can take more than 10 minutes.

At the same time, LLVM's cmake-based build system should generally manage
dependencies (and for example, do a rebuild if we try to `make install`
after upgrading all of the source code files).

Therefore, this commit adjusts the 3p-rebuild for LLVM to only
remove the install directory and to let LLVM's cmake manage the
build directory.
@mppf mppf force-pushed the fix-llvm-build-master branch from 2c1346c to e04e42a Compare July 29, 2019 17:59
Copy link
Contributor

@dmk42 dmk42 left a comment

Choose a reason for hiding this comment

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

👍

@mppf mppf merged commit 9bc9493 into chapel-lang:master Jul 29, 2019
@mppf mppf deleted the fix-llvm-build-master branch July 29, 2019 19:42
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