diff options
| author | Dylan Baker <[email protected]> | 2018-04-16 14:40:51 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-04-24 14:08:15 -0700 |
| commit | 595021bf1a67346c7dfca652ef2dbcce3e2a6ca0 (patch) | |
| tree | 5e5f7b11473e99e1714690d398b8d417a6a05538 | |
| parent | db90c8627c41486056aeef9883ef0e4a5f245441 (diff) | |
meson: remove dummy_cpp
meson has gotten pretty smart about tracking C and C++ dependencies
(internal and external), and using the right linker. This wasn't always
the case and we created empty c++ files to force the use of the c++
linker. We don't need that any more.
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | src/compiler/meson.build | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/meson.build | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/meson.build | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/meson.build b/meson.build index cfce928ca21..2e10ed74e29 100644 --- a/meson.build +++ b/meson.build @@ -1309,14 +1309,6 @@ endif # TODO: gallium driver dirs -# FIXME: this is a workaround for #2326 -prog_touch = find_program('touch') -dummy_cpp = custom_target( - 'dummy_cpp', - output : 'dummy.cpp', - command : [prog_touch, '@OUTPUT@'], -) - foreach a : pre_args add_project_arguments(a, language : ['c', 'cpp']) endforeach diff --git a/src/compiler/meson.build b/src/compiler/meson.build index da2464d7b8c..60b633832d4 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -62,7 +62,7 @@ subdir('nir') # dependency with nir/meson.build. spirv2nir = executable( 'spirv2nir', - [files('spirv/spirv2nir.c'), dummy_cpp], + files('spirv/spirv2nir.c'), dependencies : [dep_m, dep_thread, idep_nir], include_directories : [inc_common, inc_nir, include_directories('spirv')], link_with : libmesa_util, diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 0895bdac1cc..06acc78391f 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -220,7 +220,7 @@ if with_tests 'anv_@0@'.format(t), executable( t, - ['tests/@[email protected]'.format(t), dummy_cpp, anv_entrypoints[0]], + ['tests/@[email protected]'.format(t), anv_entrypoints[0]], link_with : libvulkan_intel_test, dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind], include_directories : [ diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 8e23fd43ad6..943727b662a 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -44,7 +44,7 @@ endif if dri_drivers != [] libmesa_dri_drivers = shared_library( 'mesa_dri_drivers', - dummy_cpp, # see meson #2180 + [], link_whole : dri_drivers, link_with : [ libmegadriver_stub, libdricommon, libxmlconfig, libglapi, libmesa_util, |