Commit 448814bf authored by Joerg Bornemann's avatar Joerg Bornemann
Browse files

Pick up GNU tools from the mother repo's gnuwin32 directory


This makes it unnecessary to have gperf, bison and flex in PATH.

Change-Id: Ie4a0dea4452e3a38067b47eb41c3e9904274e175
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@qt.io>
parent f32b3514
Branches
Tags
No related merge requests found
Showing with 16 additions and 3 deletions
# this must be done outside any function
QTWEBENGINE_SOURCE_TREE = $$PWD
equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe
defineTest(isPythonVersionSupported) { defineTest(isPythonVersionSupported) {
...@@ -41,8 +44,18 @@ defineTest(qtConfTest_detectPython2) { ...@@ -41,8 +44,18 @@ defineTest(qtConfTest_detectPython2) {
return(true) return(true)
} }
defineReplace(qtConfFindGnuTool) {
equals(QMAKE_HOST.os, Windows) {
gnuwin32bindir = $$absolute_path($$QTWEBENGINE_SOURCE_TREE/../gnuwin32/bin)
gnuwin32toolpath = "$$gnuwin32bindir/$${1}"
exists($$gnuwin32toolpath): \
return($$gnuwin32toolpath)
}
return($$qtConfFindInPath($$1))
}
defineTest(qtConfTest_detectGperf) { defineTest(qtConfTest_detectGperf) {
gperf = $$qtConfFindInPath("gperf$$EXE_SUFFIX") gperf = $$qtConfFindGnuTool("gperf$$EXE_SUFFIX")
isEmpty(gperf) { isEmpty(gperf) {
qtLog("Required gperf could not be found.") qtLog("Required gperf could not be found.")
return(false) return(false)
...@@ -52,7 +65,7 @@ defineTest(qtConfTest_detectGperf) { ...@@ -52,7 +65,7 @@ defineTest(qtConfTest_detectGperf) {
} }
defineTest(qtConfTest_detectBison) { defineTest(qtConfTest_detectBison) {
bison = $$qtConfFindInPath("bison$$EXE_SUFFIX") bison = $$qtConfFindGnuTool("bison$$EXE_SUFFIX")
isEmpty(bison) { isEmpty(bison) {
qtLog("Required bison could not be found.") qtLog("Required bison could not be found.")
return(false) return(false)
...@@ -62,7 +75,7 @@ defineTest(qtConfTest_detectBison) { ...@@ -62,7 +75,7 @@ defineTest(qtConfTest_detectBison) {
} }
defineTest(qtConfTest_detectFlex) { defineTest(qtConfTest_detectFlex) {
flex = $$qtConfFindInPath("flex$$EXE_SUFFIX") flex = $$qtConfFindGnuTool("flex$$EXE_SUFFIX")
isEmpty(flex) { isEmpty(flex) {
qtLog("Required flex could not be found.") qtLog("Required flex could not be found.")
return(false) return(false)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment