From b52d58e204ffcb3dcd55ddee390d256cfbb1b54b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Nov 2019 19:53:59 -0800 Subject: [PATCH] mkspecs: Allow builds with libc != glibc Signed-off-by: Khem Raj --- src/buildtools/config/support.pri | 4 ---- src/buildtools/configure.json | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index e192f877..49ad4bf3 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -181,10 +181,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { defineTest(qtwebengine_checkForGlibc) { module = $$1 - !qtConfig(webengine-system-glibc) { - qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.") - return(false) - } return(true) } diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 1ca6214a..b352e675 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -376,7 +376,6 @@ && (!config.sanitizer || features.webengine-sanitizer) && (!config.linux || features.pkg-config) && (!config.linux || features.webengine-host-pkg-config) - && (!config.linux || features.webengine-system-glibc) && (!config.linux || features.webengine-system-khr) && (!config.linux || features.webengine-system-nss) && (!config.linux || features.webengine-system-dbus) @@ -743,8 +742,7 @@ "webengine-system-fontconfig", "webengine-system-dbus", "webengine-system-nss", - "webengine-system-khr", - "webengine-system-glibc" + "webengine-system-khr" ] }, {