diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-15 16:05:19 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-15 16:06:17 +0300 |
commit | 48aa50e1fa9b9c4e819aeaf77c098da52d457ec1 (patch) | |
tree | cf4367971c772ad0a02b8eaed0c0a4052538e144 /vcl | |
parent | 4b282f0eb8e5fa37f23ce3e4cbc5b349aea93925 (diff) |
Just using CAIRO_LIBS in ldflags is not enough
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_vcl.mk | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index bf0d1a096ca8..19c1c9e7fcf6 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -490,10 +490,24 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\ $$(CAIRO_CFLAGS) \ -DSYSTEM_CAIRO \ )) + +# CAIRO_LIBS contains both -L and -l options. Thes sets LDFLAGS which +# goes early into the linking command line before the object files. So +# on platforms where libraries are searched for symbols undefined at +# that point as they occur on the command line, it is pointless to +# search the cairo library at that point as no references to cairo +# entries have been read from object files yet. $(eval $(call gb_Library_set_ldflags,vcl,\ $$(LDFLAGS) \ $$(CAIRO_LIBS) \ )) + +# Thus we also need to add cairo to the list of linked libs. These go +# after the object files on the linking command line. +$(eval $(call gb_Library_add_linked_libs,vcl,\ + cairo \ +)) + else $(eval $(call gb_Library_add_linked_libs,vcl,\ cairo \ |