meson: Remove build_by_default from amd code

This is the same logic as the previous two patches.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index 62beb0ecbc1290bff0cab06713f3c6ac6aaa64f8..1a7f2fdef5d8e347b5ad3e191bf6ee9057a4984d 100644 (file)
--- 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'],
     '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 842b42f897ef1e290560edea285f709cdd8b96bd..4fd7edc5cd3c157064f6ed6ef8863275ed56d92e 100644 (file)
--- 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],
                   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 c3b1ff00d001ac081bad1a18def830e1873d66a3..9232cc4ab183d625ddc3629958bf4b88420f20d0 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,7 +51,9 @@ subdir('mapi')
 subdir('compiler')
 subdir('egl/wayland/wayland-drm')
 subdir('vulkan')
 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
 if with_gallium_vc4
   subdir('broadcom')
 endif