Modified config files to add the compiler flag, /Qspectre (#878)
This commit is contained in:
parent
3679b48df2
commit
69e82080ea
|
@ -24,7 +24,7 @@ environment:
|
||||||
SQL_INSTANCE: SQL2017
|
SQL_INSTANCE: SQL2017
|
||||||
PHP_VC: 15
|
PHP_VC: 15
|
||||||
PHP_MAJOR_VER: 7.2
|
PHP_MAJOR_VER: 7.2
|
||||||
PHP_MINOR_VER: latest
|
PHP_MINOR_VER: 11
|
||||||
PHP_EXE_PATH: x64\Release_TS
|
PHP_EXE_PATH: x64\Release_TS
|
||||||
THREAD: ts
|
THREAD: ts
|
||||||
platform: x64
|
platform: x64
|
||||||
|
|
|
@ -37,7 +37,14 @@ if( PHP_PDO_SQLSRV != "no" ) {
|
||||||
if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf /O2" );
|
if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf /O2" );
|
||||||
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
||||||
if (VCVERS >= 1913) {
|
if (VCVERS >= 1913) {
|
||||||
|
ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
|
||||||
ADD_FLAG("CFLAGS_PDO_SQLSRV", "/Qspectre");
|
ADD_FLAG("CFLAGS_PDO_SQLSRV", "/Qspectre");
|
||||||
|
} else if (VCVERS == 1900) {
|
||||||
|
var subver1900 = probe_binary(PHP_CL).substr(6);
|
||||||
|
if (subver1900 >= 24241) {
|
||||||
|
ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
|
||||||
|
ADD_FLAG('CFLAGS_PDO_SQLSRV', "/Qspectre");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
|
ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
|
||||||
EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
||||||
|
|
|
@ -36,11 +36,18 @@ if( PHP_SQLSRV != "no" ) {
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
|
||||||
if (VCVERS >= 1913) {
|
if (VCVERS >= 1913) {
|
||||||
|
ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
|
||||||
ADD_FLAG("CFLAGS_SQLSRV", "/Qspectre");
|
ADD_FLAG("CFLAGS_SQLSRV", "/Qspectre");
|
||||||
|
} else if (VCVERS == 1900) {
|
||||||
|
var subver1900 = probe_binary(PHP_CL).substr(6);
|
||||||
|
if (subver1900 >= 24241) {
|
||||||
|
ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
|
||||||
|
ADD_FLAG('CFLAGS_SQLSRV', "/Qspectre");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf /O2" );
|
if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf /O2" );
|
||||||
EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
||||||
} else {
|
} else {
|
||||||
WARNING("sqlsrv not enabled; libraries and headers not found");
|
WARNING("sqlsrv not enabled; libraries and headers not found");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue