summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-11-13 11:16:28 -0800
committerDylan Baker <[email protected]>2017-11-13 13:43:20 -0800
commit46a7fdd7ca86a5bbf5fff30028cb3093a41c4237 (patch)
tree8ebad5728a8858666fc64482267e97980583aad9
parent49fa0747268af6aa22c89c5eacffe36bf93084d0 (diff)
meson: Remove build_by_default from amd code
This is the same logic as the previous two patches. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/amd/addrlib/meson.build1
-rw-r--r--src/amd/common/meson.build1
-rw-r--r--src/meson.build4
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