Revert "Enable whole program optimization for builds without PGO, too"

This reverts commit f052e99df6f4b3bc4e2a1e9717ee36339a33f33b.

There appear to be link issues with upcoming 19.11 and /LTCG, prefer
wider dependency compatibility.

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index bf393b04f659ca3e7794d5ed87dedf9ab5fad8f6..1aeb94010f259025bf631bd865961f18fd5ceb19 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1229,9 +1229,6 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
                }
 
                ldflags += " /PGD:$(PGOPGD_DIR)\\" + makefiletarget.substring(0, makefiletarget.indexOf(".")) + ".pgd";
-       } else if (PHP_DEBUG != "yes") {
-               ADD_FLAG('CFLAGS_' + SAPI, "/GL");
-               ADD_FLAG('LDFLAGS_' + SAPI, "/LTCG:INCREMENTAL");
        }
 
        if (MODE_PHPIZE) {
@@ -1432,9 +1429,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
                        ADD_FLAG('CFLAGS_' + EXT, "/GL /O2");
 
                        ldflags = " /PGD:$(PGOPGD_DIR)\\" + dllname.substring(0, dllname.indexOf(".")) + ".pgd";
-               } else if (PHP_DEBUG != "yes") {
-                       ADD_FLAG('CFLAGS_' + EXT, "/GL");
-                       ADD_FLAG('LDFLAGS_' + EXT, "/LTCG:INCREMENTAL");
                }
 
                MFO.WriteLine("$(BUILD_DIR)\\" + libname + ": $(BUILD_DIR)\\" + dllname);
@@ -1477,9 +1471,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
                                ADD_FLAG("STATIC_EXT_CFLAGS", "/GL /O2");
                                static_pgo_enabled = true;
                        }
-               } else if (PHP_DEBUG != "yes") {
-                       ADD_FLAG("STATIC_EXT_CFLAGS", "/GL");
-                       ADD_FLAG('STATIC_EXT_LDFLAGS', "/LTCG:INCREMENTAL");
                }
 
                /* find the header that declares the module pointer,