aboutsummaryrefslogtreecommitdiff
path: root/meson.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-05-31 15:40:10 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-05-31 15:40:10 +0530
commitf56b402a5b98fbb2c2f3af4ebdac3f53313c5ab1 (patch)
tree6b34356b429ef9282214ed80ba6437a72944cf41 /meson.py
parent05f8b1bd7829c425a8a4838394b8c2d5964c7553 (diff)
downloadmeson-f56b402a5b98fbb2c2f3af4ebdac3f53313c5ab1.zip
meson-f56b402a5b98fbb2c2f3af4ebdac3f53313c5ab1.tar.gz
meson-f56b402a5b98fbb2c2f3af4ebdac3f53313c5ab1.tar.bz2
Revert "mesonlib: handle meson exe wrappers"
This reverts commit 0627e9d616dc311b7c9b0ef17301f680ac9e78a7. Breaks installation: https://github.com/mesonbuild/meson/issues/3647 Will be restored once that can be fixed.
Diffstat (limited to 'meson.py')
-rwxr-xr-xmeson.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/meson.py b/meson.py
index 8f944c7..abbac6f 100755
--- a/meson.py
+++ b/meson.py
@@ -15,7 +15,12 @@
# limitations under the License.
from mesonbuild import mesonmain
-import sys
+import sys, os
+
+def main():
+ # Always resolve the command path so Ninja can find it for regen, tests, etc.
+ launcher = os.path.realpath(sys.argv[0])
+ return mesonmain.run(sys.argv[1:], launcher)
if __name__ == '__main__':
- sys.exit(mesonmain.main())
+ sys.exit(main())