mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-20 15:48:54 +02:00
make tests not dynamic link against /lib/libglib
For some reason, even though the tests are linked against libgobject.la and libgobject.la mentions libglib.la as a dependency, the tests are running against the system glib instead of the in-tree one. Adding the libglib.la file as an explicit LDFLAG fixes it.
This commit is contained in:
@@ -11,6 +11,12 @@ libgthread = $(top_builddir)/gthread/libgthread-2.0.la
|
|||||||
libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
|
libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
|
||||||
libgobject = $(top_builddir)/gobject/libgobject-2.0.la
|
libgobject = $(top_builddir)/gobject/libgobject-2.0.la
|
||||||
|
|
||||||
|
|
||||||
|
# libtool dependency tracking seems broken. this is currently
|
||||||
|
# required to get the tests to dynamic link against the in-tree
|
||||||
|
# libglib instead of the system one
|
||||||
|
libgobject += $(libglib)
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libtestgobject.la
|
noinst_LTLIBRARIES = libtestgobject.la
|
||||||
@@ -45,7 +51,7 @@ CLEANFILES = stamp-testmarshal.h
|
|||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
LDADD = libtestgobject.la $(libgobject)
|
LDADD = libtestgobject.la $(libgobject)
|
||||||
|
|
||||||
test_programs = \
|
test_programs = \
|
||||||
deftype \
|
deftype \
|
||||||
|
Reference in New Issue
Block a user