diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-12-30 14:37:04 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-12-30 14:37:04 +0100 |
| commit | 42b0bbd758dec6b842f6be644874cd95199b10f7 (patch) | |
| tree | d41f2f7287a07c042ade51e95cbda565d97d4867 | |
| parent | d4b7cc1dbab2cb11319a8af1c8a53dd5baedbefd (diff) | |
| parent | 20de58f51d92660481923c7f795d2e36e9626247 (diff) | |
| download | php-git-42b0bbd758dec6b842f6be644874cd95199b10f7.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Drop deprecated /Gm compile option
| -rw-r--r-- | win32/build/confutils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index e85ed65642..11fc7d2ae6 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -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 |