Allow building both 32-bit and 64-bit JNI libraries #36
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
Since we will be distributing this as an uberjar, we need to be able to build both 32-bit and 64-bit versions of the libraries. Update the documentation to match. Change-Id: Ie0a862ef7c6155f11fde1403841aee54d2634656
Change-Id: I969abc1f5fbfb39ff41b6343a297f40db432b121
nmittler
approved these changes
Jan 12, 2017
Change-Id: Ieba72e5bde58b3c41c1dd2c7ffd4d51afd9d921f
Change-Id: I9845dffc990f9a7dd25a84f1ba2a8c8c13039bdf
nmittler
reviewed
Jan 12, 2017
| @@ -35,7 +35,7 @@ before_script: | |||
| - popd | |||
| # Build BoringSSL for 32-bit | |||
| - mkdir $BORINGSSL_HOME/build32 && pushd $BORINGSSL_HOME/build32 | |||
| - cmake -DCMAKE_TOOLCHAIN_FILE=../util/32-bit-toolchain.cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_ASM_FLAGS=-Wa,--noexecstack -GNinja .. | |||
| - cmake -DCMAKE_TOOLCHAIN_FILE=../util/32-bit-toolchain.cmake -DCMAKE_ASM_FLAGS="-m32 -msse2" -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_ASM_FLAGS=-Wa,--noexecstack -GNinja .. | |||
There was a problem hiding this comment.
Could it be a cmake version issue? Maybe need to upgrade?
There was a problem hiding this comment.
Accidentally defined CMAKE_ASM_FLAGS twice.
Change-Id: I366b73daa4cb3c077339335472602186401eb79b
Change-Id: I239866370d46962267fa4f1435aa11d56fdbdd04
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.
Since we will be distributing this as an uberjar, we need to be able to
build both 32-bit and 64-bit versions of the libraries.
Update the documentation to match.
Change-Id: Ie0a862ef7c6155f11fde1403841aee54d2634656