File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -348,7 +348,8 @@ def getShellVariableSetters(shellVariables):
348
348
# helper function to validate Meson invocations (and use the correct one)
349
349
meson()
350
350
{
351
- if [[ "$*" != *buildtype* ]]; then
351
+ if [[ "$*" != *buildtype* ]] && [[ "$*" != compile* ]] \
352
+ && [[ "$*" != install* ]] && [[ "$*" != test* ]]; then
352
353
echo "error: invoking meson without --buildtype argument"
353
354
echo "note: you probably want --buildtype=release or --buildtype=debugoptimized"
354
355
exit 1
@@ -365,7 +366,17 @@ def getShellVariableSetters(shellVariables):
365
366
MESON=$(type -Pp meson)
366
367
fi
367
368
368
- $MESON --wrap-mode=nodownload "$@"
369
+ if [[ "$*" != compile* ]] && [[ "$*" != install* ]] \
370
+ && [[ "$*" != test* ]]; then
371
+ local PATTERN='^setup (.*)'
372
+ if [[ "$*" =~ $PATTERN ]]; then
373
+ $MESON setup --wrap-mode=nodownload ${BASH_REMATCH[1]}
374
+ else
375
+ $MESON --wrap-mode=nodownload "$@"
376
+ fi
377
+ else
378
+ $MESON "$@"
379
+ fi
369
380
}
370
381
371
382
fixDevelopLibDirReferences()
You can’t perform that action at this time.
0 commit comments