Added Control Flow Guard to configs
This commit is contained in:
parent
44e447a86a
commit
244e3401b5
|
@ -30,11 +30,12 @@ if( PHP_PDO_SQLSRV != "no" ) {
|
||||||
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC");
|
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC");
|
||||||
CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC");
|
CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC");
|
||||||
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "pdo_sqlsrv" );
|
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "pdo_sqlsrv" );
|
||||||
ADD_FLAG( "LDFLAGS_PDO_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" );
|
ADD_FLAG( "LDFLAGS_PDO_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug /guard:cf" );
|
||||||
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" );
|
||||||
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/GS" );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/GS" );
|
||||||
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" );
|
||||||
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/O2" );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/O2" );
|
||||||
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf" );
|
||||||
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
||||||
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");
|
||||||
|
|
|
@ -30,12 +30,13 @@ if( PHP_SQLSRV != "no" ) {
|
||||||
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
|
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
|
||||||
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");
|
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");
|
||||||
CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_SQLSRV_ODBC");
|
CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_SQLSRV_ODBC");
|
||||||
ADD_FLAG( "LDFLAGS_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" );
|
ADD_FLAG( "LDFLAGS_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug /guard:cf" );
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" );
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
|
||||||
ADD_FLAG( "CFLAGS_SQLSRV", "/O2" );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/O2" );
|
||||||
|
ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf" );
|
||||||
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