Skip to content

Commit 1dfd424

Browse files
committed
meson: generate run helper
Signed-off-by: Pavel Hrdina <[email protected]> Reviewed-by: Peter Krempa <[email protected]> Reviewed-by: Neal Gompa <[email protected]>
1 parent 932a5b5 commit 1dfd424

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

configure.ac

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ m4_if(m4_version_compare([2.61a.100],
103103
[AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
104104
[GNUmakefile=$GNUmakefile])])
105105

106-
AC_CONFIG_FILES([run],
107-
[chmod +x,-w run])
108106
AC_CONFIG_FILES([\
109107
Makefile \
110108
.color_coded \

meson.build

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,6 +2315,17 @@ endif
23152315
configure_file(output: 'meson-config.h', configuration: conf)
23162316

23172317

2318+
# generate run helper
2319+
run_conf = configuration_data()
2320+
run_conf.set('abs_builddir', meson.build_root())
2321+
configure_file(
2322+
input: 'run.in',
2323+
output: 'run',
2324+
configuration: run_conf,
2325+
)
2326+
run_command('chmod', 'a+x', meson.current_build_dir() / 'run')
2327+
2328+
23182329
# print configuration summary
23192330

23202331
driver_summary = {

run.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ random_val="$(awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)"
7171
export MALLOC_PERTURB_=$random_val
7272

7373
# Run the program.
74-
exec $b/libtool --mode=execute "$@"
74+
exec "$@"

0 commit comments

Comments
 (0)