add gnu make 4.2.1#84
Conversation
cosmicexplorer
force-pushed
the
add-make
branch
from
2f21f65 to
89d1026
Compare
| # Default to 2 parallel jobs if unspecified. | ||
| readonly SUBPROC_MAKE_JOBS="${SUBPROC_MAKE_JOBS:-2}" | ||
|
|
||
| case "$(uname)" in |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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=("$@") |
There was a problem hiding this comment.
This seems like a good deal of ceremony over just a single line of "$@".
There was a problem hiding this comment.
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.
stuhood
left a comment
stuhood
left a comment
There was a problem hiding this comment.
Looks good from my perspective: successfully built on both osx and linux.
|
Let me know when you're ready to merge (or merge and then ping me) please. |
3 participants
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).