diff options
| author | Qiang Yu <yuq825@gmail.com> | 2020-04-24 16:20:25 +0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-05-11 10:17:19 -0700 |
| commit | 6b2e0a0c13bd097f0f10f4783b0d749fcdd12374 (patch) | |
| tree | 6b8dd34cb9534ba797526f30bac253e4ece72042 | |
| parent | 6486fcc79e23e94ca3cf4c31a9130d624e72a433 (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 <alyssa.rosenzweig@collabora.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4960>
(cherry picked from commit 07b0fbea92a66499ef7c0f9b748b1034831201b1)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/panfrost/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 2def5f73b4c..229ea8e6d4d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -391,7 +391,7 @@ "description": "panfrost: don't always build bifrost_compiler", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "ec2a59cd7aa42652645e76e29a72335370c80e50" }, diff --git a/meson_options.txt b/meson_options.txt index 1a2dd8ebd12..398dc8a9376 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -325,7 +325,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 aecbb7018c8..a2c18b22b45 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -54,5 +54,5 @@ bifrost_compiler = executable( libglsl_standalone, libpanfrost_bifrost ], - build_by_default : true + build_by_default : with_tools.contains('panfrost') ) |