diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 19:28:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:33 +0200 |
| commit | 2f6261fa07e496439e4476d2be2c4c9bca9e6e52 (patch) | |
| tree | b4d42a82b581c1ab0c47d14eb2b066a191e2264b /liborcus | |
| parent | 8b4deabeedd09f5968fa90ae04209ded4a717f6f (diff) | |
find lots of external static libraries in UnpackedTarball dir
Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:
ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)
Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 43b46213575a..5790131b1df6 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -38,7 +38,7 @@ endif ifeq ($(SYSTEM_BOOST),YES) liborcus_LIBS+=$(BOOST_SYSTEM_LIB) else -liborcus_LIBS+=$(SOLARLIB) -lboostsystem +liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem endif ifeq ($(OS),ANDROID) liborcus_LIBS+=-lgnustl_shared -lm |