diff options
author | Michal Klocek <michal.klocek@qt.io> | 2019-05-27 16:31:43 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2019-05-27 16:34:54 +0200 |
commit | 2ed6d17c0b03cacd00dc35ec71ae29c0cfb7d552 (patch) | |
tree | 5c444d214df37f7e357ee530d9dad66890498deb /configure.pri | |
parent | e58f2aa8e515e5faf54ec9364a2b7972f9761dcd (diff) |
Add more robust glibc test
This test also works now when cross compiling.
Change-Id: If73e16084cfbaf68ba515c2706d3ec2ec8eab8c9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/configure.pri b/configure.pri index 58899b9ef..23f72c5c6 100644 --- a/configure.pri +++ b/configure.pri @@ -86,26 +86,6 @@ defineTest(qtConfTest_detectFlex) { return(true) } -defineTest(qtConfTest_detectGlibc) { - ldd = $$qtConfFindInPath("ldd") - !isEmpty(ldd) { - qtLog("Found ldd from path: $$ldd") - qtRunLoggedCommand("$$ldd --version", version)|return(true) - version ~= 's/^.*[^0-9]\([0-9]*\.[0-9]*\).*$/\1/' - version = $$first(version) - qtLog("Found libc version: $$version") - version = $$split(version,'.') - version = $$member(version, 1) - greaterThan(version, 26) { - return(true) - } - qtLog("Detected too old version of glibc. Required min 2.27.") - return(false) - } - qtLog("No ldd found. Assuming right version of glibc.") - return(true) -} - defineTest(qtConfTest_detectNinja) { ninja = $$qtConfFindInPath("ninja$$EXE_SUFFIX") !isEmpty(ninja) { |