diff --git a/src/intel/compiler/brw_disasm_info.c b/src/intel/compiler/brw_disasm_info.c index 9cb781429a8..a2c3c1e9f0c 100644 --- a/src/intel/compiler/brw_disasm_info.c +++ b/src/intel/compiler/brw_disasm_info.c @@ -28,9 +28,6 @@ #include "dev/intel_debug.h" #include "compiler/nir/nir.h" -__attribute__((weak)) void nir_print_instr(UNUSED const nir_instr *instr, - UNUSED FILE *fp) {} - void dump_assembly(void *assembly, int start_offset, int end_offset, struct disasm_info *disasm, const unsigned *block_latency) diff --git a/src/intel/compiler/elk/elk_disasm_info.c b/src/intel/compiler/elk/elk_disasm_info.c index 85d91063153..4ea0d20f21d 100644 --- a/src/intel/compiler/elk/elk_disasm_info.c +++ b/src/intel/compiler/elk/elk_disasm_info.c @@ -28,9 +28,6 @@ #include "dev/intel_debug.h" #include "compiler/nir/nir.h" -__attribute__((weak)) void nir_print_instr(UNUSED const nir_instr *instr, - UNUSED FILE *fp) {} - void elk_dump_assembly(void *assembly, int start_offset, int end_offset, struct elk_disasm_info *disasm, const unsigned *block_latency) diff --git a/src/intel/compiler/elk/meson.build b/src/intel/compiler/elk/meson.build index 2a4d6fcaeda..d7472c8a4e1 100644 --- a/src/intel/compiler/elk/meson.build +++ b/src/intel/compiler/elk/meson.build @@ -154,6 +154,9 @@ libintel_compiler_elk = static_library( idep_intel_compiler_elk = declare_dependency( link_with : [libintel_compiler_elk], + dependencies : [ + idep_nir, + ], ) if with_tests diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index dd8e55ff436..8e238d7b5df 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -153,6 +153,9 @@ libintel_compiler_brw = static_library( idep_intel_compiler_brw = declare_dependency( link_with : [libintel_compiler_brw], + dependencies : [ + idep_nir, + ], ) # For now this tool is only going to be used by Anv