Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Drop deprecated /Gm compile option
This commit is contained in:
Christoph M. Becker 2018-12-30 14:37:04 +01:00
commit 42b0bbd758

View file

@ -3356,7 +3356,7 @@ function toolset_setup_common_libs()
function toolset_setup_build_mode()
{
if (PHP_DEBUG == "yes") {
ADD_FLAG("CFLAGS", "/LDd /MDd /W3 /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 " +
ADD_FLAG("CFLAGS", "/LDd /MDd /W3 /Od /D _DEBUG /D ZEND_DEBUG=1 " +
(X64?"/Zi":"/ZI"));
ADD_FLAG("LDFLAGS", "/debug");
// Avoid problems when linking to release libraries that use the release