[FIX]: utf8proc include path for system library builds #1922
+6
−9
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.
In raising this pull request, I confirm the following (please check boxes):
My familiarity with the project is as follows (check one):
Problem
CCExtractor uses a non-standard include path for
utf8procinsrc/lib_ccx/params.c:#include <utf8proc/utf8proc.h>However, utf8proc is installed as
<utf8proc.h>(without a subdirectory) on all major platforms:/usr/include/utf8proc.h/usr/include/utf8proc.h$(brew --prefix)/include/utf8proc.h$out/include/utf8proc.hinstalled/<triplet>/include/utf8proc.hThis caused build failures when using the
-system-libsflag on Homebrew Linux.Solution
This PR uses
__has_include()to support both paths:<utf8proc.h>(standard location)<utf8proc/utf8proc.h>(CCExtractor's vendored copy)Also removes the temporary symlink workaround from
linux/buildas it's no longer needed.Testing
-system-libsand without on Linux