Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
meson: use wrapper program instead of bypassing it
meson persists its own full path (argv[0]) to the build.ninja file, which then runs it without the PYTHONPATH which the meson wrapper program sets up. To make this work, we need to make meson write the full path to its *wrapper program* into build.ninja.
- Loading branch information
1 parent
cefded2
commit f45ee9a
Showing
2 changed files
with
14 additions
and
1 deletion.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- old/mesonbuild/mesonmain.py 2020-05-02 22:37:55.035436359 +0200 | ||
| +++ new/mesonbuild/mesonmain.py 2020-05-02 22:38:28.588262968 +0200 | ||
| @@ -225,6 +225,7 @@ | ||
| launcher = sys.executable | ||
| else: | ||
| launcher = os.path.realpath(sys.argv[0]) | ||
| + launcher = '/ro/meson-amd64-0.54.1-7/bin/meson' | ||
| return run(sys.argv[1:], launcher) | ||
|
|
||
| if __name__ == '__main__': | ||
| Binary files /dev/null and new/mesonbuild/mesonmain.py~ differ |