diff options
| author | Eric Engestrom <[email protected]> | 2019-09-25 00:35:07 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-10-07 21:49:40 +0100 |
| commit | a0a8b240787bd6b7a193e576f13ae1c0182de61f (patch) | |
| tree | 6cc49117faad0c53f4fc84db540f9b923878c2d8 | |
| parent | 731097c747acdc2949688601ca8790151bb81a86 (diff) | |
meson: use idep_nir instead of libnir in libnouveau
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index 2e65a81f024..e48b61b8955 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -223,13 +223,14 @@ nouveau_compiler = executable( 'nouveau_compiler', 'nouveau_compiler.c', include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux], - dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil], - link_with : [libnouveau, libgallium, libnir], + dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil, idep_nir], + link_with : [libnouveau, libgallium], build_by_default : with_tools.contains('nouveau'), install : with_tools.contains('nouveau'), ) driver_nouveau = declare_dependency( compile_args : '-DGALLIUM_NOUVEAU', - link_with : [libnouveauwinsys, libnouveau, libnir], + dependencies : idep_nir, + link_with : [libnouveauwinsys, libnouveau], ) |