Skip to content

Commit

Permalink
meson: Use link_whole() not link_with(), for the Xorg dixmods.
Browse files Browse the repository at this point in the history
I clearly hadn't run ninja test, since fb no longer had any of the fb
symbols in it.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  • Loading branch information
anholt committed May 9, 2017
1 parent a06bb73 commit 1dd14e7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions hw/xfree86/dixmods/meson.build
Expand Up @@ -18,7 +18,7 @@ shared_module(
include_directories: [inc, xorg_inc],
c_args: xorg_c_args,
dependencies: common_dep,
link_with: libxserver_fb,
link_whole: libxserver_fb,

install: true,
install_dir: module_dir,
Expand All @@ -31,7 +31,7 @@ shared_module(
include_directories: [inc, xorg_inc],
c_args: [ xorg_c_args, wfb_args ],
dependencies: common_dep,
link_with: libxserver_wfb,
link_whole: libxserver_wfb,

install: true,
install_dir: module_dir,
Expand All @@ -43,7 +43,7 @@ shared_module(
include_directories: [inc, xorg_inc],
c_args: xorg_c_args,
dependencies: common_dep,
link_with: libxserver_miext_shadow,
link_whole: libxserver_miext_shadow,

install: true,
install_dir: module_dir,
Expand All @@ -57,7 +57,7 @@ if build_glx
include_directories: [ inc, xorg_inc, glx_inc ],
c_args: [ xorg_c_args, glx_align64 ],
dependencies: [ common_dep, dl_dep ],
link_with: libxserver_glx,
link_whole: libxserver_glx,

install: true,
install_dir: join_paths(module_dir, 'extensions')
Expand Down

0 comments on commit 1dd14e7

Please sign in to comment.