From d038a846e4deca41a7795b62a06e2f22d7fcad30 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 27 Apr 2016 11:06:49 +0200
Subject: [PATCH] Don't link against libdl on any bsd
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>
---
src/libs/sqlite/sqlite-lib.pri | 2 +-
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"] : [])
--
GitLab