mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: /guard is also a security flag
This commit is contained in:
commit
22ed374c9a
@ -3041,7 +3041,9 @@ function toolset_setup_common_cflags()
|
||||
ADD_FLAG('CFLAGS', ' /RTC1 ');
|
||||
} else {
|
||||
if (VCVERS >= 1900) {
|
||||
ADD_FLAG('CFLAGS', "/guard:cf");
|
||||
if (PHP_SECURITY_FLAGS == "yes") {
|
||||
ADD_FLAG('CFLAGS', "/guard:cf");
|
||||
}
|
||||
}
|
||||
if (VCVERS >= 1800) {
|
||||
if (PHP_PGI != "yes" && PHP_PGO != "yes") {
|
||||
@ -3082,7 +3084,9 @@ function toolset_setup_common_ldlags()
|
||||
|
||||
if (VS_TOOLSET) {
|
||||
if (VCVERS >= 1900) {
|
||||
ADD_FLAG('LDFLAGS', "/GUARD:CF");
|
||||
if (PHP_SECURITY_FLAGS == "yes") {
|
||||
ADD_FLAG('LDFLAGS', "/GUARD:CF");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user