summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-03-19 09:37:43 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-03-19 09:37:43 +0000
commitb1ebf474d34dad6d1a2e3d2593af41e9a5505746 (patch)
treef9c2eb12761d58e061856fd7f61be7188e81a69a
parent2869315af1645d2c045bdeb696642f629e1858f9 (diff)
Import Mesa 18.3.5
-rw-r--r--lib/mesa/meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mesa/meson.build b/lib/mesa/meson.build
index f11c556d3..64bd10900 100644
--- a/lib/mesa/meson.build
+++ b/lib/mesa/meson.build
@@ -64,11 +64,11 @@ endif
dri_drivers_path = get_option('dri-drivers-path')
if dri_drivers_path == ''
- dri_drivers_path = join_paths(get_option('libdir'), 'dri')
+ dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
endif
dri_search_path = get_option('dri-search-path')
if dri_search_path == ''
- dri_search_path = join_paths(get_option('prefix'), dri_drivers_path)
+ dri_search_path = dri_drivers_path
endif
with_gles1 = get_option('gles1')
@@ -615,7 +615,7 @@ with_gallium_xa = _xa != 'false'
d3d_drivers_path = get_option('d3d-drivers-path')
if d3d_drivers_path == ''
- d3d_drivers_path = join_paths(get_option('libdir'), 'd3d')
+ d3d_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'd3d')
endif
with_gallium_st_nine = get_option('gallium-nine')