coin: Preserve quoted arguments when calling cmake / configure
Previously we used sh $* for passing parameters of various calls like cmake / configure. This did not properly preserve quoted arguments, leading to potential issues. For example when configuring qtbase with cmake -DQT_QMAKE_DEVICE_OPTIONS="DISTRO_OPTS=hard-float boot2qt" the 'boot2qt' option would be passed as a separate argument to cmake, leading to the QT_QMAKE_DEVICE_OPTIONS cache var containing only 'DISTRO_OPTS=hard-float'. Use "$@" to preserve the quotes. Inspired by https://wiki.bash-hackers.org/scripting/posparams#all_positional_parameters Amends e9b8837c31041326a0e4d66eed6775d385913915 Pick-to: 6.2 6.3 Change-Id: Ib67d4bc138c65f7430457cb2a2baa55bff72e549 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
parent
19b7f854a2
commit
b0824ad931
@ -265,7 +265,7 @@ instructions:
|
||||
instructions:
|
||||
# Need to unset QMAKESPEC, so that the pre-installed boot2qt mkspec is not picked up.
|
||||
- type: WriteFile
|
||||
fileContents: "#!/bin/bash\nunset LD_LIBRARY_PATH\n. {{.Env.QT_YOCTO_ENVSETUP}}\nexport PATH={{.Env.QT_CMAKE_DIR}}:$PATH;\nunset QMAKESPEC\n$*"
|
||||
fileContents: "#!/bin/bash\nunset LD_LIBRARY_PATH\n. {{.Env.QT_YOCTO_ENVSETUP}}\nexport PATH={{.Env.QT_CMAKE_DIR}}:$PATH;\nunset QMAKESPEC\n\"$@\""
|
||||
filename: "{{.Env.HOME}}/prefix.sh"
|
||||
fileMode: 493
|
||||
maxTimeInSeconds: 20
|
||||
|
Loading…
x
Reference in New Issue
Block a user