/guard is also a security flag

weltling · weltling · commit f98d8f6c159d · 2017-01-07T02:25:00.000+01:00
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -2856,7 +2856,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");
+				}
 			}
 		}
 
@@ -2888,7 +2890,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");
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2856,7 +2856,9 @@ function toolset_setup_common_cflags()`
`2856`	`2856`	`ADD_FLAG('CFLAGS', ' /RTC1 ');`
`2857`	`2857`	`} else {`
`2858`	`2858`	`if (VCVERS >= 1900) {`
`2859`		`- ADD_FLAG('CFLAGS', "/guard:cf");`
	`2859`	`+ if (PHP_SECURITY_FLAGS == "yes") {`
	`2860`	`+ ADD_FLAG('CFLAGS', "/guard:cf");`
	`2861`	`+ }`
`2860`	`2862`	`}`
`2861`	`2863`	`}`
`2862`	`2864`
`@@ -2888,7 +2890,9 @@ function toolset_setup_common_ldlags()`
`2888`	`2890`
`2889`	`2891`	`if (VS_TOOLSET) {`
`2890`	`2892`	`if (VCVERS >= 1900) {`
`2891`		`- ADD_FLAG('LDFLAGS', "/GUARD:CF");`
	`2893`	`+ if (PHP_SECURITY_FLAGS == "yes") {`
	`2894`	`+ ADD_FLAG('LDFLAGS', "/GUARD:CF");`
	`2895`	`+ }`
`2892`	`2896`	`}`
`2893`	`2897`	`}`
`2894`	`2898`	`}`