summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-04-16 14:39:59 -0700
committerDylan Baker <[email protected]>2018-04-24 14:08:15 -0700
commitdb90c8627c41486056aeef9883ef0e4a5f245441 (patch)
treedbf88c59f064467901d97bd02c6dc6b82128e6f9 /src/glx
parent92550d9b16d2b295bdac087f31b1fd6d0f808e02 (diff)
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 <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/meson.build9
1 files changed, 1 insertions, 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,