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

Makefile refactors for global install and new sysroot #801

Merged
merged 23 commits into from
May 27, 2020
Merged

Conversation

ehildenb
Copy link
Member

This PR makes several changes in preparation for (i) updating the K submodule to the new sysroot, and (ii) using K Docker Images for CI (with a global K install).

  • K_RELEASE is set differently in Makefile and kevm. In order of priority, first it's (i) what the user sets environment variable to, (ii) the submodule if the submodule is present, and (iii) a global install of K found with which kompile.
  • All uses of git submodule update ... are removed from the Makefile, because the Makefile should not depend on the VCS that is used to store it. This also makes it easier to have a custom commit of K in the submodule without having to commit it (for example).
  • The flag LINK_PROCPS is removed, in favor of a STANDALONE_KOMPILE_OPTS flag which holds all the kompile options for the standalone build (and adds -lprocps for Linux systems).
  • The cmake/client file is updated to include the paths needed for a global install of K.

@ehildenb ehildenb requested a review from dwightguth May 24, 2020 10:49
@ehildenb
Copy link
Member Author

Docker Images PR (which should work after this): #785

@ehildenb ehildenb requested review from anvacaru and gtrepta May 25, 2020 07:25
Copy link
Collaborator

@dwightguth dwightguth left a comment

Choose a reason for hiding this comment

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

This looks good. I had one minor suggestion, but it looks like that variable isn't really used anywhere, so I'm going to approve.

One other thing to note: You don't need to add -I include/kllvm if you add kllvm/ before your includes to the runtime directory. So it would be kllvm/runtime/header.h. It's up to you though, you're free to keep the code with the change you just made as well.

Makefile Outdated Show resolved Hide resolved
@rv-jenkins rv-jenkins merged commit fac5ebb into master May 27, 2020
@rv-jenkins rv-jenkins deleted the set-k-release branch May 27, 2020 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants