meson: Don't call find_program objects with python

On UNIX-like OSes, the OS will read the shebang and use the correct
interpreter, and on Windows, Meson will read the shebang and use the
correct interpreter.

Adding it manually will cause python to try to interpret python
macos/v1.5.9
Nirbheek Chauhan 8 years ago
parent 7c902e3e2b
commit d82bedc227
  1. 4
      include/epoxy/meson.build
  2. 5
      meson.build
  3. 4
      src/meson.build

@ -4,7 +4,6 @@ gl_generated = custom_target('gl_generated.h',
'gl_generated.h', 'gl_generated.h',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--header', '--header',
'--no-source', '--no-source',
@ -24,7 +23,6 @@ if build_egl
'egl_generated.h', 'egl_generated.h',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--header', '--header',
'--no-source', '--no-source',
@ -44,7 +42,6 @@ if build_glx
'glx_generated.h', 'glx_generated.h',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--header', '--header',
'--no-source', '--no-source',
@ -64,7 +61,6 @@ if build_wgl
'wgl_generated.h', 'wgl_generated.h',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--header', '--header',
'--no-source', '--no-source',

@ -132,11 +132,6 @@ configure_file(input: 'epoxy.pc.in',
install: true, install: true,
install_dir: join_paths(epoxy_libdir, 'pkgconfig')) install_dir: join_paths(epoxy_libdir, 'pkgconfig'))
# Find Python for gen_dispatch
# XXX: With Meson 0.37 we should use
# python = import('python3').find_python()
python = find_program('python3')
# Generates the dispatch tables # Generates the dispatch tables
gen_dispatch_py = find_program('src/gen_dispatch.py') gen_dispatch_py = find_program('src/gen_dispatch.py')

@ -12,7 +12,6 @@ gl_generated = custom_target('gl_generated_dispatch.c',
'gl_generated_dispatch.c', 'gl_generated_dispatch.c',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--source', '--source',
'--no-header', '--no-header',
@ -30,7 +29,6 @@ if build_egl
'egl_generated_dispatch.c', 'egl_generated_dispatch.c',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--source', '--source',
'--no-header', '--no-header',
@ -48,7 +46,6 @@ if build_glx
'glx_generated_dispatch.c', 'glx_generated_dispatch.c',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--source', '--source',
'--no-header', '--no-header',
@ -66,7 +63,6 @@ if build_wgl
'wgl_generated_dispatch.c', 'wgl_generated_dispatch.c',
], ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--source', '--source',
'--no-header', '--no-header',

Loading…
Cancel
Save