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 /python3 | |
| 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 'python3')
| -rw-r--r-- | python3/ExternalProject_python3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index e79a28e0fdc3..3abf24a0d938 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -80,8 +80,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : )" \ $(if $(python3_cflags),CFLAGS='$(python3_cflags)') \ LDFLAGS="$(strip $(LDFLAGS) \ - $(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(OUTDIR)/lib) \ - $(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(OUTDIR)/lib) \ + $(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(call gb_UnpackedTarball_get_dir,openssl)) \ + $(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \ |