php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source 
* PHP-7.0:
  /guard is also a security flag
This commit is contained in:
Anatol Belski
2017-01-07 02:48:14 +01:00
parent f7bb3b5cbd f98d8f6c15
commit 22ed374c9a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win32/build/confutils.js
+6 -2
View File
@@ -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");
}
}
}
}