diff options
| author | Dylan Baker <[email protected]> | 2019-06-28 16:36:38 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-06-28 16:36:38 -0700 |
| commit | 97c2c4546ca5d7c17f039dde9a6fd5957fb2364a (patch) | |
| tree | 08b051f00a8a094f7c4145b33a311ef0dbae68b2 /src/gallium/drivers/swr/rasterizer | |
| parent | 69f9fbab8a92a2bb797723f28fe8dad5cd8c8a64 (diff) | |
Revert "meson: Add support for using cmake for finding LLVM"
This reverts commit 5157a4276500c77e2210e853b262be1d1b30aedf.
There is a meson bug that causes llvm to always be statically linked,
which is obviously not what we want. I haven't had time to look into it
yet, but for now let's just revert it.
Diffstat (limited to 'src/gallium/drivers/swr/rasterizer')
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/jitter/meson.build | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/meson.build b/src/gallium/drivers/swr/rasterizer/jitter/meson.build index 6885c344939..aced4a1b735 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/meson.build +++ b/src/gallium/drivers/swr/rasterizer/jitter/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017-2019 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -19,17 +19,14 @@ # SOFTWARE. -if meson.version().version_compare('>=0.51') - _llvm_includedir = dep_llvm.get_variable(configtool : 'includedir', cmake : 'LLVM_INCLUDE_DIR') -else - _llvm_includedir = dep_llvm.get_configtool_variable('includedir') -endif - gen_builder_hpp = custom_target( 'gen_builder.hpp', input : [ swr_gen_llvm_ir_macros_py, - join_paths(_llvm_includedir, 'llvm', 'IR', 'IRBuilder.h') + join_paths( + dep_llvm.get_configtool_variable('includedir'), 'llvm', 'IR', + 'IRBuilder.h' + ) ], output : 'gen_builder.hpp', command : [ |