[Mesa-dev] [PATCH 3/7] meson: allow empty sources when using link_whole

Dylan Baker dylan at pnwbakers.com
Mon Apr 16 23:48:57 UTC 2018


meson used to get grumpy if the sources list was empty, even when using
--whole-archive (link_whole). In more recent versions that's not true,
so remove the workaround.

Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
---
 src/glx/meson.build | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/glx/meson.build b/src/glx/meson.build
index 90ab552ac4d..dd8ba60ad80 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -157,17 +157,10 @@ libglx = static_library(
   build_by_default : false,
 )
 
-# workaround for bug #2180
-dummy_c = custom_target(
-  'dummy_c',
-  output : 'dummy.c',
-  command : [prog_touch, '@OUTPUT@'],
-)
-
 if with_glx == 'dri'
   libgl = shared_library(
     gl_lib_name,
-    dummy_c,  # workaround for bug #2180
+    [],
     include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
     link_with : [libglapi_static, libglapi],
     link_whole : libglx,
-- 
2.17.0



More information about the mesa-dev mailing list