Separate external by host#3469
Merged
rustyrussell merged 2 commits intoFeb 4, 2020
Merged
Conversation
Contributor
Author
|
I had to bump libwally-core as well since they had a bug regarding out-of-tree builds. |
rustyrussell
approved these changes
Jan 30, 2020
Contributor
rustyrussell
left a comment
rustyrussell
left a comment
There was a problem hiding this comment.
Just needs to squash and a meaningful commit msg, thanks!
| $(RM) $(EXTERNAL_LIBS) $(TARGET_DIR)/*.la $(TARGET_DIR)/*.o | ||
| if [ -f ${TARGET_DIR}/libsodium-build/Makefile ]; then make -C ${TARGET_DIR}/libsodium-build clean; fi | ||
| if [ -f ${TARGET_DIR}/libwally-core-build/Makefile ]; then make -C ${TARGET_DIR}/libwally-core-build clean; fi | ||
| if [ -f ${TARGET_DIR}/ibwally-core-build/src/Makefile ]; then make -C ${TARGET_DIR}/libwally-core-build/src clean; fi |
Contributor
There was a problem hiding this comment.
Hmm, note the (preexisting!) "ibwally-core" typo!
Collaborator
cc'ing @cdecker re: libwally update |
NickeZ
force-pushed
the
separate-external-by-host
branch
from
11762f2 to
b234b7f
Compare
Contributor
Author
|
Fixed the pre-existing bug and improved the commit message. Thanks for the reviews. |
On CI it is nice to cache the external dependencies. However if we always compile them in the same folder we cannot cache for multiple different architectures. After this commit native compile targets will still live in `external` but cross compiled versions will live in `external/<arch>`.
cdecker
force-pushed
the
separate-external-by-host
branch
from
b234b7f to
db97a44
Compare
Member
|
I allowed myself to rephrase the commit message for the wally bump. ACK db97a44 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ideally we would support out-of-source-tree builds. But until then we can at least separate the external dependencies per architecture.
The problem I ran into is that we want to cache external dependencies in CI. But this means that the cached files are compiled for the wrong host when we cross-compile.
This PR will compile all dependencies outside their soure trees. The "native" files will stay in
external. cross compiled files will go intoexternal/<host-triplet>likeexternal/aarch64-linux-gnu.The first time you build this PR you might need to wipe your dependencies. Since currently we are building "in-source-tree" automake will complain loudly if you try to build "out-of-source-tree" without cleaning up first.
Changelog-None