fix(build): compilation on macos when including nim-nat-traversal #1084
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
- removes the `VERSION` rename to `VERSION_temp` in the Makefile - instead, relies on `-iqoute` to include the `nim-nat-traversal/vendor/libnatpmp-upstream` directory in the search paths. `-iquote` will match the `vendor/libnatpmp-upstream/VERSION` file for `#include "version"` and not `#include <version>`, the latter being what is included by the macos sdk and was causing issues with `-I`. The [gcc 14.2 docs](https://gcc.gnu.org/onlinedocs/gcc-14.2.0/cpp/Invocation.html#index-I) describe how `-iquote` alleviates this issue: > Directories specified with -iquote apply only to the quote form of the directive, #include "file". Directories specified with -I, -isystem, or -idirafter apply to lookup for both the #include "file" and #include <file> directives. For more info, please see status-im/nim-nat-traversal#34.
Now that status-im/nim-nat-traversal#34 has been merged, change back to master commit
emizzle
force-pushed
the
fix/build/macos-compile-with-nat-traversal
branch
from
9c3c2dd to
3b79379
Compare
|
@AuHau would you mind re-reviewing please 🙏 |
AuHau
approved these changes
Jan 28, 2025
dryajov
approved these changes
Feb 7, 2025
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.
Removes the
VERSIONrename toVERSION_tempin the Makefile, instead relying on a change innim-nat-traversal.The change in
nim-nat-traversaluses-iqouteto include thenim-nat-traversal/vendor/libnatpmp-upstreamdirectory in the search paths.-iquotewill match thevendor/libnatpmp-upstream/VERSIONfile for#include "version"and not#include <version>, the latter being what is included by the macos sdk and was causing issues with-I. The gcc 14.2 docs describe how-iquotealleviates this issue:For more info, please see status-im/nim-nat-traversal#34.
NOTE: This PR relies on a branch of
nim-nat-traversaldue to status-im/nim-nat-traversal#34. It's probably best to wait for that to be merged first, before merging this PR.