summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-08-19 10:56:43 +0200
committerAnatol Belski <ab@php.net>2015-08-19 10:56:43 +0200
commit7f4ae19c80d8ab52dd9e654d098588db110aa7c6 (patch)
tree9cfd0c7a5d32ea4f39c2ee00c09c0dcd86f95bec /win32
parent3708d9c1b452f64a2d78a286351b8830e1f09e21 (diff)
downloadphp-git-7f4ae19c80d8ab52dd9e654d098588db110aa7c6.tar.gz
added /guard:cf to release builds
Diffstat (limited to 'win32')
-rw-r--r--win32/build/confutils.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 3bab5dcb9f..355327156d 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2641,6 +2641,10 @@ function toolset_setup_common_cflags()
if (PHP_DEBUG == "yes") {
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
+ } else {
+ if (VCVERS >= 1900) {
+ ADD_FLAG('CFLAGS', "/guard:cf");
+ }
}
} else if (CLANG_TOOLSET) {
@@ -2668,6 +2672,12 @@ function toolset_setup_common_ldlags()
// we want msvcrt in the PHP DLL
ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt");
+
+ if (VS_TOOLSET) {
+ if (VCVERS >= 1900) {
+ ADD_FLAG('LDFLAGS', "/GUARD:CF");
+ }
+ }
}
function toolset_setup_common_libs()