diff options
| author | Martin Peres <martin.peres@linux.intel.com> | 2017-01-25 17:29:15 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-01-25 14:47:10 -0500 |
| commit | b1a6986395f85b0194646a34b49367086dc9239d (patch) | |
| tree | cec95d05b14f193acd7689f462b78917bea7665e /test | |
| parent | cc0f173ea2936d1405e382329c1bd58c7af67ea7 (diff) | |
tests: shuffle around the linking order to please GNU ld
Classic GNU ld resolves symbol dependencies only forward, while GOLD
seems to work regardless of the specified library order.
Suggested-by: Eero Tamminen <eero.t.tamminen@intel.com>
Reviewed-by: Mihail Konev <k.mvc@ya.ru>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 111b60788..e7fe587bb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -64,7 +64,7 @@ tests_LDFLAGS = \ -Wl,-wrap,GrabButton \ $() -tests_LDADD = $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) +tests_LDADD = tests_SOURCES = \ tests-common.c \ @@ -225,6 +225,10 @@ endif endif !XORG +# GNU LD scans only in one direction, add the following dependencies at the end +# so as they get picked up by the previously-linked libraries +tests_LDADD += $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) + endif ENABLE_UNIT_TESTS EXTRA_DIST = \ |