diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-27 11:06:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-27 14:15:03 +0000 |
| commit | d038a846e4deca41a7795b62a06e2f22d7fcad30 (patch) | |
| tree | f40f9c80d1db543b1511621367f73335a530a0b6 | |
| parent | fb137ade7d93955a930ca9ba21f55dfd6b599f08 (diff) | |
Don't link against libdl on any bsd3.6
Task-number: QTCREATORBUG-15898
Change-Id: I5953700dfa58aa12c7c43a0e370c23fe569b2d10
Reviewed-by: Ralf Nolden <nolden@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | src/libs/sqlite/sqlite-lib.pri | 2 | ||||
| -rw-r--r-- | src/libs/sqlite/sqlite.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri index 5c742d19f7..f8ef1c1a03 100644 --- a/src/libs/sqlite/sqlite-lib.pri +++ b/src/libs/sqlite/sqlite-lib.pri @@ -6,7 +6,7 @@ contains(CONFIG, dll) { INCLUDEPATH += $$PWD -unix:!openbsd: LIBS += -ldl +unix:!bsd: LIBS += -ldl include(../3rdparty/sqlite/sqlite.pri) diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs index e974e38cd6..62291da5b5 100644 --- a/src/libs/sqlite/sqlite.qbs +++ b/src/libs/sqlite/sqlite.qbs @@ -13,7 +13,7 @@ QtcLibrary { "SQLITE_ENABLE_COLUMN_METADATA" ]) cpp.optimization: "fast" - cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("openbsd")) + cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) ? ["dl", "pthread"] : []) |