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>

diff --git a/configure.ac b/configure.ac
index a227555b891fbd9a5705730cc4de5765eb7d15dc..de8fc2d567cd6a4bbf33318c942b531c7a11fb21 100644 (file)
--- 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 1ab88acd0d6d2641dbaa3272c9aebeeef170367b..e93016dfe36d8966b4e005d852403ea158c00ac2 100644 (file)
--- 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 1a0dee4d9ee854fefb2b237ffdd475c484549640..73bebbf805f6313b097a0fe01e1b4f4b62aa68b8 100644 (file)
--- 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 "$@"