Skip to content

Commit f94dca3

Browse files
author
nono303
committed
https://github.com/php/php-sdk-binary-tools/pull/15
1 parent 390c3af commit f94dca3

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

modules/php-sdk.patch

+12-23
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
1-
diff --git a/bin/php/php.ini b/bin/php/php.ini
2-
index 5fc05c7..06306ea 100644
3-
--- a/bin/php/php.ini
4-
+++ b/bin/php/php.ini
5-
@@ -8,5 +8,5 @@ extension=php_mysqli.dll
6-
memory_limit=4G
7-
8-
error_reporting=-1
9-
-display_errors=1
10-
+display_errors=0
11-
display_startup_errors=1
1+
bin/phpsdk_setshell.bat | 2 +-
2+
1 file changed, 1 insertion(+), 1 deletion(-)
3+
124
diff --git a/bin/phpsdk_setshell.bat b/bin/phpsdk_setshell.bat
13-
index f651a4e..6c291db 100644
5+
index 8c41734..0dcb846 100644
146
--- a/bin/phpsdk_setshell.bat
157
+++ b/bin/phpsdk_setshell.bat
16-
@@ -199,9 +199,9 @@ if "%HOST_ARCH_NAME%"=="%TARGET_ARCH_NAME%" (
17-
set VCVARSALL_ARCH_NAME=%HOST_ARCH_NAME%_%TARGET_ARCH_NAME%
18-
)
19-
if 15 gtr %PHP_SDK_VS_NUM% (
20-
- set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
21-
+ set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\VsDevCmd.bat" -arch=!VCVARSALL_ARCH_NAME! -vcvars_ver=%vcvars_ver% -winsdk=%WKITVER% -no_logo
8+
@@ -211,7 +211,7 @@ if 15 gtr %PHP_SDK_VS_NUM% (
9+
)
2210
) else (
23-
- set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
24-
+ set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\VsDevCmd.bat" -arch=!VCVARSALL_ARCH_NAME! -vcvars_ver=%vcvars_ver% -winsdk=%WKITVER% -no_logo
25-
)
26-
set VCVARSALL_ARCH_NAME=
27-
11+
if NOT "%TOOLSET%"=="" (
12+
- set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET%
13+
+ set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\VsDevCmd.bat" -arch=!VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET% -winsdk=%WKITVER% -no_logo
14+
) else (
15+
set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
16+
)

modules/php.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ for %%E in (pecl-datetime-timezonedb pecl-memcache pecl-text-xdiff php-ext-brotl
6868
if exist %PATH_PHP_SDK%\phpsdk-local.bat del /Q /F %PATH_PHP_SDK%\phpsdk-local.bat
6969
xcopy /C /F /Y %PATH_MODULES%\phpsdk-local.bat %PATH_PHP_SDK%\*
7070

71-
call %PATH_PHP_SDK%\phpsdk-starter.bat -c %MSVC_DEPS% -a %ARCH% %*
71+
call %PATH_PHP_SDK%\phpsdk-starter.bat -c %MSVC_DEPS% -a %ARCH% -s %vcvars_ver%

0 commit comments

Comments
 (0)