Mesa (staging/18.2): meson: link LLVM 'native' component when LLVM is available

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Dec 10 14:55:02 UTC 2018


Module: Mesa
Branch: staging/18.2
Commit: 4ca3d839ea5aa004285171315b91e02819b455ed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ca3d839ea5aa004285171315b91e02819b455ed

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed Dec  5 13:28:03 2018 +0100

meson: link LLVM 'native' component when LLVM is available

Linking against LLVM built with BUILD_SHARED_LIBS fails otherwise,
as the component is required for the draw module.

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 4275cae95c8cb217d6164dfeeafae7b56484b13d)

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index cce31cd6fb..30f33a3bf4 100644
--- a/meson.build
+++ b/meson.build
@@ -1139,7 +1139,7 @@ endif
 llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
 llvm_optional_modules = []
 if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
-  llvm_modules += ['amdgpu', 'bitreader', 'ipo']
+  llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo']
   if with_gallium_r600
     llvm_modules += 'asmparser'
   endif




More information about the mesa-commit mailing list