From 1dfd4248e93762dc032347d0c91e00cfa46d1bef Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 1 Jul 2020 02:52:45 +0200
Subject: [PATCH] meson: generate run helper

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---
 configure.ac |  2 --
 meson.build  | 11 +++++++++++
 run.in       |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a227555b89..de8fc2d567 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,8 +103,6 @@ m4_if(m4_version_compare([2.61a.100],
       [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
         [GNUmakefile=$GNUmakefile])])
 
-AC_CONFIG_FILES([run],
-                [chmod +x,-w run])
 AC_CONFIG_FILES([\
         Makefile \
         .color_coded \
diff --git a/meson.build b/meson.build
index 1ab88acd0d..e93016dfe3 100644
--- a/meson.build
+++ b/meson.build
@@ -2315,6 +2315,17 @@ endif
 configure_file(output: 'meson-config.h', configuration: conf)
 
 
+# generate run helper
+run_conf = configuration_data()
+run_conf.set('abs_builddir', meson.build_root())
+configure_file(
+  input: 'run.in',
+  output: 'run',
+  configuration: run_conf,
+)
+run_command('chmod', 'a+x', meson.current_build_dir() / 'run')
+
+
 # print configuration summary
 
 driver_summary = {
diff --git a/run.in b/run.in
index 1a0dee4d9e..73bebbf805 100644
--- a/run.in
+++ b/run.in
@@ -71,4 +71,4 @@ random_val="$(awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)"
 export MALLOC_PERTURB_=$random_val
 
 # Run the program.
-exec $b/libtool --mode=execute "$@"
+exec "$@"