Mac: Fix Travis script to match my recent changes to build scripts #2324
Conversation
This file contains 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
…d buildsqlite3.sh scripts: don't rebuild these libraries if they are 64-bit only (i.e., if they are not "universal" binaries containing both 32-bit and 64-bit code)
|
This PR will have a conflict with master once #2323 is merged or vice versa. I strongly veto the merge with the cherry-picked commit present. |
|
GitHub says this doesn't have conflict with master but I'm not going to merge this until the cherry-picked commit is removed. @ChristianBeer Could you remove the commit so that we won't need fourth committer to review this PR? If the commit is needed in this branch I would suggest rebasing the PR, not merging master to this PR. |
|
@JuhaSointusalo thanks for merging the other PR. I'm going to reset the branch and merge it myself after the currently running Mac build of the master branch is done. |
ChristianBeer
force-pushed
the
mac_fix_travis_script
branch
from
3840103
to
ff6bca9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Mac: Fix Travis script to match my recent changes to buildWxMac.sh and buildsqlite3.sh scripts: don't rebuild these libraries if they are 64-bit only (i.e., if they are not "universal" binaries containing both 32-bit and 64-bit code,) This will significantly reduce Travis build times when the versions of wxWidgets and SQLite3 haven't changed.