com php-src: added /guard:cf to release builds: win32/build/confutils.js
| From: | Anatol Belski | Date: | Wed, 19 Aug 2015 08:56:43 +0000 |
| Subject: | com php-src: added /guard:cf to release builds: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88677@lists.php.net to get a copy of this message | ||
Commit: 7f4ae19c80d8ab52dd9e654d098588db110aa7c6
Author: Anatol Belski <ab@php.net> Wed, 19 Aug 2015 10:56:43 +0200
Parents: 3708d9c1b452f64a2d78a286351b8830e1f09e21
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7f4ae19c80d8ab52dd9e654d098588db110aa7c6
Log:
added /guard:cf to release builds
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 3bab5dc..3553271 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()