meson: Always include 'coroutines' in llvm optional modules

Submitted by Mike Lothian on Sept. 7, 2019, 2:20 p.m.

Details

Message ID 20190907142030.2706442-1-mike@fireburn.co.uk
State New
Headers show
Series "meson: Always include 'coroutines' in llvm optional modules" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mike Lothian Sept. 7, 2019, 2:20 p.m.
Without this I get build failures:

error: undefined reference to 'LLVMAddCoroEarlyPass'
error: undefined reference to 'LLVMAddCoroSplitPass'
error: undefined reference to 'LLVMAddCoroElidePass'
error: undefined reference to 'LLVMAddCoroCleanupPass'

Cc: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
---
 meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meson.build b/meson.build
index db21d4dbce4..9a3a9e1e0e1 100644
--- a/meson.build
+++ b/meson.build
@@ -1227,7 +1227,7 @@  if dep_libdrm.found()
 endif
 
 llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
-llvm_optional_modules = []
+llvm_optional_modules = ['coroutines']
 if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
   llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo']
   if with_gallium_r600
@@ -1239,7 +1239,6 @@  if with_gallium_opencl
     'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
     'lto', 'option', 'objcarcopts', 'profiledata',
   ]
-  llvm_optional_modules += ['coroutines']
 endif
 
 if with_amd_vk or with_gallium_radeonsi

Comments

There's an open MR by Vinson for that issue:
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1878

On 2019-09-07 at 15:20, Mike Lothian <mike@fireburn.co.uk> wrote:
> Without this I get build failures:
> 
> error: undefined reference to 'LLVMAddCoroEarlyPass'
> error: undefined reference to 'LLVMAddCoroSplitPass'
> error: undefined reference to 'LLVMAddCoroElidePass'
> error: undefined reference to 'LLVMAddCoroCleanupPass'
> 
> Cc: Dylan Baker <dylan@pnwbakers.com>
> Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
> ---
>  meson.build | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index db21d4dbce4..9a3a9e1e0e1 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1227,7 +1227,7 @@ if dep_libdrm.found()
>  endif
>  
>  llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
> -llvm_optional_modules = []
> +llvm_optional_modules = ['coroutines']
>  if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
>    llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo']
>    if with_gallium_r600
> @@ -1239,7 +1239,6 @@ if with_gallium_opencl
>      'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
>      'lto', 'option', 'objcarcopts', 'profiledata',
>    ]
> -  llvm_optional_modules += ['coroutines']
>  endif
>  
>  if with_amd_vk or with_gallium_radeonsi
> -- 
> 2.23.0
> 
>