diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-01 13:02:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-05 09:38:28 +0000 |
| commit | c7345f4ac23d877a28f0d75f83b770c3835aa10d (patch) | |
| tree | 08650ceaeb725b149c63a5c620d122e7815cf280 | |
| parent | re-enable unit tests accidentally disabled with HAVE_FEATURE_ATL (diff) | |
| download | core-c7345f4ac23d877a28f0d75f83b770c3835aa10d.tar.gz core-c7345f4ac23d877a28f0d75f83b770c3835aa10d.zip | |
python3: override LINKCC properly, it needs -pthread
Build on Fedora 24 fails with "Python/thread.o: undefined
reference to symbol 'pthread_key_delete@@GLIBC_2.0'"
Change-Id: If23838722e1cd0220c509d25932ae0539e8da7a1
(cherry picked from commit e31914d7f4588c475c5d59ffbc0187503967591d)
Reviewed-on: https://gerrit.libreoffice.org/26865
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rwxr-xr-x | external/python3/ExternalProject_python3.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 76f8d886b314..38ed6700435e 100755 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ )" \ $(if $(python3_cflags),CFLAGS='$(python3_cflags)') \ - $(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX)") \ + $(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX) -pthread") \ LDFLAGS="$(strip $(LDFLAGS) \ $(if $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \ $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \ |