archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  /guard is also a security flag
This commit is contained in:
Anatol Belski 2017-01-07 02:49:44 +01:00
commit 3aece4629b
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32/build/confutils.js
View file

@ -3067,7 +3067,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") {
@ -3108,7 +3110,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");
}
}
}
}