File tree Expand file tree Collapse file tree 3 files changed +16
-7
lines changed
extension/BuildPhpExtension Expand file tree Collapse file tree 3 files changed +16
-7
lines changed Original file line number Diff line number Diff line change 7979 ' Add-PhpDependencies' ,
8080 ' Add-StepLog' ,
8181 ' Add-Vs' ,
82- ' Get-ArgumentFromConfig ' ,
82+ ' Get-ArgumentsFromConfig ' ,
8383 ' Get-BuildDirectory' ,
8484 ' Get-Extension' ,
8585 ' Get-ExtensionConfig' ,
Original file line number Diff line number Diff line change 1- Function Get-ArgumentFromConfig {
1+ Function Get-ArgumentsFromConfig {
22 <#
33 . SYNOPSIS
44 Get the Libraries from the config.w32 file
@@ -31,6 +31,12 @@ Function Get-ArgumentFromConfig {
3131 $dashedExtension = $Extension
3232 }
3333
34+ $arguments = @ ()
35+
36+ if ($configW32Content.contains (' ARG_WITH("boost"' )) {
37+ $arguments += " --with-boost=..\deps\boost"
38+ }
39+
3440 $argValue = ' ' ;
3541 if ($ConfigW32Content.Contains (" PHP_$ ( $Extension.ToUpper ()) _SHARED" )) {
3642 $argValue = " shared"
@@ -46,7 +52,8 @@ Function Get-ArgumentFromConfig {
4652 if ($argValue -ne ' ' ) {
4753 $arg = " $arg =$argValue "
4854 }
49- return $arg
55+ $arguments += $arg
56+ return $arguments
5057 }
5158 end {
5259 }
Original file line number Diff line number Diff line change @@ -153,10 +153,12 @@ Function Get-ExtensionConfig {
153153 }
154154
155155 if ($env: AUTO_DETECT_ARGS -eq ' true' ) {
156- $argument = Get-ArgumentFromConfig $Extension $configW32Content
157- $argumentKey = $argument.Split (" =" )[0 ]
158- if ($null -ne $argument -and -not ($config.options.contains ($argumentKey ))) {
159- $config.options += " $argument "
156+ $arguments = Get-ArgumentsFromConfig $Extension $configW32Content
157+ foreach ($argument in $arguments ) {
158+ $argumentKey = $argument.Split (" =" )[0 ]
159+ if ($null -ne $argument -and -not ($config.options.contains ($argumentKey ))) {
160+ $config.options += " $argument "
161+ }
160162 }
161163 }
162164
You can’t perform that action at this time.
0 commit comments