From 46a7fdd7ca86a5bbf5fff30028cb3093a41c4237 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 13 Nov 2017 11:16:28 -0800 Subject: [PATCH] meson: Remove build_by_default from amd code This is the same logic as the previous two patches. Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt --- src/amd/addrlib/meson.build | 1 - src/amd/common/meson.build | 1 - src/meson.build | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build index 62beb0ecbc1..1a7f2fdef5d 100644 --- a/src/amd/addrlib/meson.build +++ b/src/amd/addrlib/meson.build @@ -57,5 +57,4 @@ libamdgpu_addrlib = static_library( 'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip', '../common', '../../'), cpp_args : [cpp_vis_args, '-DBRAHMA_BUILD=1'], - build_by_default : false, ) diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build index 842b42f897e..4fd7edc5cd3 100644 --- a/src/amd/common/meson.build +++ b/src/amd/common/meson.build @@ -59,5 +59,4 @@ libamd_common = static_library( dep_valgrind], c_args : [c_vis_args], cpp_args : [cpp_vis_args], - build_by_default : false, ) diff --git a/src/meson.build b/src/meson.build index c3b1ff00d00..9232cc4ab18 100644 --- a/src/meson.build +++ b/src/meson.build @@ -51,7 +51,9 @@ subdir('mapi') subdir('compiler') subdir('egl/wayland/wayland-drm') subdir('vulkan') -subdir('amd') +if with_gallium_radeonsi or with_amd_vk + subdir('amd') +endif if with_gallium_vc4 subdir('broadcom') endif -- 2.30.2