More NaCl related fixes #815
Merged
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
Contributor
jin-eld
commented
Mar 23, 2014
jin-eld
commented
- fix shared/static configuration which was still wrong
- hopefully fix linking issues on *BSD systems
Make sure the shared lib build is really disabled when compiling vs. NaCl: moved settings before libtool initialization fixed parameter name
From what I see there is a difference between *BSD and Linux when linking vs. toxcore which has been bulit vs. the NaCl library: on Linux it only links if NaCl's object files (i.e. randombytes.o) is present in the linker options, however on *BSD systems this will cause a linking error, see: JFreegman/toxic#31 (comment) This commit makes sure that we do not add the NaCl object files to our pkg-config settings on *BSD, but do add them on Linux.
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.