summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-17 16:48:01 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-18 13:21:29 +0000
commit68296aaed44710f38e925085e95a503fc679ef7c (patch)
tree48768ddf144b3e79b499d4737f83fdb44ed82987 /configure
parent077ea818af28d6815676f3bc88312c8d9219deaf (diff)
Prospective fix for Boot2Qt build in the CI
One of the parameters that Coin passes to configure is this: -device-option DISTRO_OPTS="hard-float boot2qt" The configure script would "swallow" the quotes and end up calling qmake with -device-option DISTRO_OPTS=hard-float boot2qt, causing qmake to complain that the standalone "boot2qt" option is unknown. Fix this by preserving the quotes in the forwarding helper functions. Change-Id: I16098bd35acb579ebf183b0f7746af8758269e7c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 05e2cabb41..fe9ceec93f 100755
--- a/configure
+++ b/configure
@@ -974,7 +974,7 @@ IFS=$SAVED_IFS
cmake $* "$relpath"
}
-parseCommandline $@
+parseCommandline "$@"
handleHelp
if [ "$BUILD_WITH_CMAKE" = "yes" ]; then
getCMakeCmdLine $@
@@ -984,8 +984,8 @@ else
findAwk
findMake
checkQMakeEnv
- checkTopLevelBuild $@
- getOptAndQMakeCmdLines $@
+ checkTopLevelBuild "$@"
+ getOptAndQMakeCmdLines "$@"
detectOperatingSystem
maybeVerifyXcode
detectQtVersion