diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-30 00:25:46 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | b5068692b6295bc088fb58b4eedf267771ed3544 (patch) | |
| tree | 7e5bc31b6771bbc0ab364fd94e6808f47909066f | |
| parent | 97904f7a1c0779828067c2e223083ef1482d3511 (diff) | |
| download | gobject-introspection-b5068692b6295bc088fb58b4eedf267771ed3544.tar.gz | |
Revert "meson: Handle spaces in the full python path"
This reverts commit f473d3b3ede94639f8d68fe618cc4cd287053181.
This can cause Meson to run g-ir-scanner with the wrong python; for
instance if you built gobject-introspection with a 64-bit Python but
you have a 32-bit Python in your PATH.
The correct fix is https://github.com/mesonbuild/meson/pull/2708.
| -rw-r--r-- | tools/meson.build | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/meson.build b/tools/meson.build index 1b4c6e97..e32937bf 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -1,11 +1,6 @@ libdir_abs = join_paths(get_option('prefix'), get_option('libdir')) datadir_abs = join_paths(get_option('prefix'), get_option('datadir')) python_path = python3.path() -# If there is a space in the path to python, we cannot use it in the shebang -# since there is no way to quote spaces. Use the basename instead. -if python_path.contains(' ') - python_path = python_path.split('/')[-1] -endif tools = [ ['g-ir-scanner', 'scannermain', 'scanner_main'], |