Add support for "local" sub-directory of sysroot #13769
Open
Conversation
This file contains hidden or 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
kripken
reviewed
Mar 25, 2021
tools/building.py
Outdated
| @@ -319,6 +319,10 @@ def configure(args, stdout=None, stderr=None, env=None, cflags=[], **kwargs): | |||
| # compilation with emcc, but instead do builds natively with Clang. This | |||
| # is a heuristic emulation that may or may not work. | |||
| env['EMMAKEN_JUST_CONFIGURE'] = '1' | |||
| if not any(a.startswith('--prefix') for a in args): | |||
| sysroot = os.path.join(shared.Cache.get_sysroot_dir()) | |||
| args.append('--prefix=' + os.path.join(shared.Cache.get_sysroot_dir(), 'local')) | |||
There was a problem hiding this comment.
this code seems unrelated to the comment above it, and i'm not sure what it does?
There was a problem hiding this comment.
You are right, this is kind of a separate change.. and it requires some more testing.
Automatically add `sysroot/local/include` and `sysroot/local/lib` to the include and library path. Also, use this new local subdirectory by default in emscripten by passing `--prefix=<sysroot>/local`. This should make `emconfigure + make install` work out of the box. Also, add `sysroot/lib` to the library path which allows libraries installed via `./configure --prefix=<sysroot>` and then `make install` to be found automativally. Fixes: #13753
|
This issue has been automatically marked as stale because there has been no activity in the past year. It will be closed automatically if no further activity occurs in the next 30 days. Feel free to re-open at any time if this issue is still relevant. |
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.
Automatically add
sysroot/local/includeandsysroot/local/libto theinclude and library path.
Also, use this new local subdirectory by default in emscripten by
passing
--prefix=<sysroot>/local. This should makeemconfigure + make installwork out of the box.Also, add
sysroot/libto the library path which allows librariesinstalled via
./configure --prefix=<sysroot>and thenmake installto be found automatically.
Fixes: #13753