meson: support structuredAttrs in setup hook
Tested emilua with and without __structuredAttrs.
This commit is contained in:
parent
471cbdd062
commit
55933d9bf6
@ -50,7 +50,8 @@ mesonConfigurePhase() {
|
||||
mesonCheckPhase() {
|
||||
runHook preCheck
|
||||
|
||||
local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}")
|
||||
local flagsArray=()
|
||||
concatTo flagsArray mesonCheckFlags mesonCheckFlagsArray
|
||||
|
||||
echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
|
||||
meson test --no-rebuild --print-errorlogs "${flagsArray[@]}"
|
||||
@ -64,12 +65,9 @@ mesonInstallPhase() {
|
||||
local flagsArray=()
|
||||
|
||||
if [[ -n "$mesonInstallTags" ]]; then
|
||||
flagsArray+=("--tags" "${mesonInstallTags// /,}")
|
||||
flagsArray+=("--tags" "$(concatStringsSep "," mesonInstallTags)")
|
||||
fi
|
||||
flagsArray+=(
|
||||
$mesonInstallFlags
|
||||
"${mesonInstallFlagsArray[@]}"
|
||||
)
|
||||
concatTo flagsArray mesonInstallFlags mesonInstallFlagsArray
|
||||
|
||||
echoCmd 'mesonInstallPhase flags' "${flagsArray[@]}"
|
||||
meson install --no-rebuild "${flagsArray[@]}"
|
||||
|
Loading…
Reference in New Issue
Block a user