From db90c8627c41486056aeef9883ef0e4a5f245441 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 16 Apr 2018 14:39:59 -0700 Subject: [PATCH] meson: allow empty sources when using link_whole 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 Reviewed-by: Eric Anholt --- 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.30.2