escape constructed command for makefiles
Change-Id: Iec7f2bd7b02d03bf6a99dde363a41578924e523c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
8c22c9be3e
commit
a3941c2f6e
@ -192,13 +192,16 @@ defineTest(qtAddToolEnv) {
|
||||
equals(QMAKE_DIR_SEP, /) {
|
||||
contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name}
|
||||
else: infix =
|
||||
$$1 = "$$name=$$join(value, :)$$infix $$eval($$1)"
|
||||
val = "$$name=$$join(value, :)$$infix"
|
||||
} else {
|
||||
# Escape closing parens when expanding the variable, otherwise cmd confuses itself.
|
||||
contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)%
|
||||
else: infix =
|
||||
$$1 = "(set $$name=$$join(value, ;)$$infix) & $$eval($$1)"
|
||||
val = "(set $$name=$$join(value, ;)$$infix) &"
|
||||
}
|
||||
contains(MAKEFILE_GENERATOR, MS.*): val ~= s,%,%%,g
|
||||
else: val ~= s,\\\$,\$\$,g
|
||||
$$1 = "$$val $$eval($$1)"
|
||||
}
|
||||
}
|
||||
export($$1)
|
||||
|
Loading…
Reference in New Issue
Block a user