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

add gnu make 4.2.1 #84

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

cosmicexplorer
Copy link
Contributor

We need to provide gnu make in order to build 3rdparty conan dependencies. This script produces a binary which works to fix the remaining CI failure in pantsbuild/pants#6486, by providing a version of make which the conan pex can then invoke along with cmake (just using the cmake binary already in this repo).

@cosmicexplorer cosmicexplorer mentioned this pull request Oct 22, 2018
# Default to 2 parallel jobs if unspecified.
readonly SUBPROC_MAKE_JOBS="${SUBPROC_MAKE_JOBS:-2}"

case "$(uname)" in
Copy link
Contributor

Choose a reason for hiding this comment

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

This script appears to be identical to build-support/bin/make/linux/x86_64/4.2.1/build-make.sh and yet still attempts to handle both linux and osx. Can there just be 1 script or else 2 different - smaller - scripts?

Copy link
Contributor Author

@cosmicexplorer cosmicexplorer Oct 22, 2018

Choose a reason for hiding this comment

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

There can indeed be 1 or 2 such scripts (not sure of the ideal number yet), and there is no rush or other reason to justify not attempting to address this somewhat here!

}

function build_make_with_configure {
local -a configure_cmd_line=("$@")
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems like a good deal of ceremony over just a single line of "$@".

Copy link
Contributor Author

@cosmicexplorer cosmicexplorer Oct 22, 2018

Choose a reason for hiding this comment

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

This was pilfered from the gcc script, which requires --host and --target arguments to ./configure, in addition to being written as the first attempt of the new variety of binaries scripts (and therefore a bit clunky and overgeneralized). I will not look into fixing that for gcc in this PR, but this indirection has no utility here, I think.

Copy link
Member

@stuhood stuhood 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 from my perspective: successfully built on both osx and linux.

@stuhood
Copy link
Member

stuhood commented Oct 22, 2018

Let me know when you're ready to merge (or merge and then ping me) please.

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