diff options
| author | Oleksandr Tymoshenko <gonzo@bluezbox.com> | 2016-05-16 23:24:36 -0700 |
|---|---|---|
| committer | Ralf Nolden <nolden@kde.org> | 2016-05-19 10:15:42 +0000 |
| commit | e9628fbd391972d4ffe5882d283d512df7fa705c (patch) | |
| tree | 33e05104805bb15612e4591bdcdf6a6e9eef2099 /config.tests/unix | |
| parent | dd8745e1d4beedfb8ef2e42fc10050287d3975f3 (diff) | |
Fix dynamic librariy support detection for platforms without libdl
Some platforms (e.g. FreeBSD) do not have libdl, but dlopen and related
functions are part of libc. So first check for dlopen in libc, and only
if that fails, look for it in libdl.
Task-number: QTBUG-52951
Change-Id: I65a8ed18fce157da32f4e1ffeba30d7513385a8f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests/unix')
| -rw-r--r-- | config.tests/unix/dlopen/dlopen.cpp (renamed from config.tests/unix/libdl/libdl.cpp) | 0 | ||||
| -rw-r--r-- | config.tests/unix/dlopen/dlopen.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/libdl/libdl.pro | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config.tests/unix/libdl/libdl.cpp b/config.tests/unix/dlopen/dlopen.cpp index 28a82330f2..28a82330f2 100644 --- a/config.tests/unix/libdl/libdl.cpp +++ b/config.tests/unix/dlopen/dlopen.cpp diff --git a/config.tests/unix/dlopen/dlopen.pro b/config.tests/unix/dlopen/dlopen.pro new file mode 100644 index 0000000000..1d34314332 --- /dev/null +++ b/config.tests/unix/dlopen/dlopen.pro @@ -0,0 +1,2 @@ +SOURCES = $$PWD/dlopen.cpp +CONFIG -= qt dylib diff --git a/config.tests/unix/libdl/libdl.pro b/config.tests/unix/libdl/libdl.pro index 8ed5231a8f..4016395d35 100644 --- a/config.tests/unix/libdl/libdl.pro +++ b/config.tests/unix/libdl/libdl.pro @@ -1,3 +1,2 @@ -SOURCES = libdl.cpp -CONFIG -= qt dylib -!qnx: LIBS += -ldl +include(../dlopen/dlopen.pro) +LIBS += -ldl |