diff options
| author | Dylan Baker <[email protected]> | 2018-01-17 10:12:19 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-02-15 10:36:31 -0800 |
| commit | 0b73c329bc024d94d85d4e0bf5e95cd8be635eb2 (patch) | |
| tree | 33888b54887a1566b4dee072b8c81010301cf9b7 /src/gallium | |
| parent | 91a59b628745a1f77b446c85ab6163a50ebe2e55 (diff) | |
meson: Fix xa target linkage
This needs to use --whole-archive (link_whole in meson) to properly
expose symbols.
v4: - Always add libswdri and libswkmsdri to link_with list
Fixes: 0ba909f0f111824 ("meson: build gallium xa state tracker")
Signed-off-by: Dylan Baker <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/xa/meson.build | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build index 75808cd0a83..ea6e1296dae 100644 --- a/src/gallium/targets/xa/meson.build +++ b/src/gallium/targets/xa/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -30,6 +30,7 @@ if with_ld_version_script xa_link_depends += files('xa.sym') endif + libxatracker = shared_library( 'xatracker', 'target.c', @@ -39,9 +40,10 @@ libxatracker = shared_library( include_directories : [ inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], + link_whole : [libxa_st], link_with : [ - libxa_st, libgalliumvl_stub, libgallium, libmesa_util, - libpipe_loader_static, libws_null, libwsw, + libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static, + libws_null, libwsw, libswdri, libswkmsdri, ], link_depends : xa_link_depends, dependencies : [ |