diff options
| author | Pavel Hrdina <phrdina@redhat.com> | 2020-07-01 02:52:45 +0200 |
|---|---|---|
| committer | Pavel Hrdina <phrdina@redhat.com> | 2020-08-03 09:27:06 +0200 |
| commit | 1dfd4248e93762dc032347d0c91e00cfa46d1bef (patch) | |
| tree | a986e6f154647335866710ee05e3653391c61b62 | |
| parent | 932a5b5499ae2faffc77cee6f87a4a9d6e1f13b0 (diff) | |
| download | libvirt-1dfd4248e93762dc032347d0c91e00cfa46d1bef.tar.gz | |
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>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | 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 = { @@ -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 "$@" |