diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 4bd46ad9760..780d9127cac 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -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"); + } } } }