Commit cad3b523 authored by Kyle Brenneman's avatar Kyle Brenneman
Browse files

Merge branch 'sandbox/rzr/review/master' into 'master'

build: Support meson-0.49.2

See merge request glvnd/libglvnd!230
parents da0edd97 aced60b0
Pipeline #170112 passed with stages
in 1 minute and 59 seconds
......@@ -132,17 +132,18 @@ endif
gl_dispatch_type = 'pure_c'
if use_asm
thread_type = have_tls ? 'tls' : 'tsd'
if host_machine.cpu_family().startswith('x86')
gl_dispatch_type = '@0@_@1@'.format(
host_machine.cpu_family(),
have_tls ? 'tls' : 'tsd',
thread_type,
)
elif host_machine.cpu_family() == 'arm'
gl_dispatch_type = 'armv7_tsd'
elif host_machine.cpu_family() == 'aarch64'
gl_dispatch_type = 'aarch64_tsd'
elif host_machine.cpu_family() == 'ppc64'
gl_dispatch_type = 'ppc64_@0@'.format(have_tls ? 'tls' : 'tsd')
gl_dispatch_type = 'ppc64_@0@'.format(thread_type)
endif
endif
message('Using dispatch stub type: @0@'.format(gl_dispatch_type))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment