summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpal1000 <liviuprodea@yahoo.com>2022-07-21 13:59:11 +0300
committerDylan Baker <dylan.c.baker@intel.com>2022-08-16 10:08:09 -0700
commitfee07a393760b460b0a910d2bd33471b36fb5f4b (patch)
tree317c1ea6eebe57deff1cb676ac6c7bd03b405e0b
parent6cf728541b5050811f76767381cef15c18f0ba9f (diff)
downloadmesa-fee07a393760b460b0a910d2bd33471b36fb5f4b.tar.gz
meson: Microsoft / maybe Intel CLC need the all-targets workaround
just like clover Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5666 Fixes: 1506ea2ecb ("Move a bunch of the CLC stuff from src/microsoft to common code") Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17682> (cherry picked from commit b5b855149caad60042ad0bc2d4c131c7063ff088)
-rw-r--r--.pick_status.json2
-rw-r--r--meson.build1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 2bca72b1136..050e204c370 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1039,7 +1039,7 @@
"description": "meson: Microsoft / maybe Intel CLC need the all-targets workaround just like clover",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "1506ea2ecb8d017dbe1bbe7bec03294619683e13"
},
diff --git a/meson.build b/meson.build
index cdff0312e56..70a0d576b9e 100644
--- a/meson.build
+++ b/meson.build
@@ -1659,6 +1659,7 @@ if with_gallium_opencl
endif
if with_clc
llvm_modules += ['coverage', 'target', 'linker', 'irreader', 'option', 'libdriver', 'lto']
+ llvm_optional_modules += ['all-targets']
endif
if with_tests or with_gallium_softpipe
llvm_modules += 'native'