diff options
| author | Qiang Yu <[email protected]> | 2020-04-24 16:20:25 +0800 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-09 01:27:41 +0000 |
| commit | 07b0fbea92a66499ef7c0f9b748b1034831201b1 (patch) | |
| tree | 84afab31ed8906196d3673711cb91475302a8c7d | |
| parent | 727a0a53fdd4a1cf63a28c53f51d49a4164b2c89 (diff) | |
panfrost: don't always build bifrost_compiler
src/panfrost/shared is shared with lima driver, build
bifrost_compiler for lima driver is meaningless and
get link error when only lima driver is enabled.
So only build bifrost_compiler when configued with:
meson -Dtools=panfrost
Fixes: ec2a59cd7aa4 "panfrost: Move non-Gallium files outside of Gallium"
Reviewed-by: Alyssa Rosenzweig <[email protected]>
Signed-off-by: Qiang Yu <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4960>
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/panfrost/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt index d243997902f..ab43150669b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -332,7 +332,7 @@ option( 'tools', type : 'array', value : [], - choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'all'], + choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'panfrost', 'all'], description : 'List of tools to build. (Note: `intel-ui` selects `intel`)', ) option( diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index 68442fd3790..80adf9d1cd5 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -66,5 +66,5 @@ bifrost_compiler = executable( libpanfrost_encoder, libpanfrost_midgard, # references disassemble_midgard... ], - build_by_default : true + build_by_default : with_tools.contains('panfrost') ) |