more fixes related to bug #65715

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index f025ae2f394aa8e1dd2043d478e6daad02a46bcd..ac74085620cfee4e6d0c0a09c98e6077e0d185d6 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -250,13 +250,13 @@ if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
 // CFLAGS, LDFLAGS and BUILD_DIR are defined
 // Add compiler and link flags if PGO options are selected
 if (PHP_DEBUG != "yes" && PHP_PGI == "yes") {
-       ADD_FLAG('CFLAGS', "/GL /O2");
-       ADD_FLAG('LDFLAGS', "/LTCG:PGINSTRUMENT");
+       ADD_FLAG('DLL_LDFLAGS', "/LTCG:PGINSTRUMENT");
+       ADD_FLAG("STATIC_EXT_CFLAGS", "/GL /O2");
        DEFINE("PGOPGD_DIR", "$(BUILD_DIR)");
 }
 else if (PHP_DEBUG != "yes" && PHP_PGO != "no") {
-       ADD_FLAG('CFLAGS', "/GL /O2");
-       ADD_FLAG('LDFLAGS', "/LTCG:PGUPDATE");
+       ADD_FLAG('DLL_LDFLAGS', "/LTCG:PGUPDATE");
+       ADD_FLAG("STATIC_EXT_CFLAGS", "/GL /O2");
        DEFINE("PGOPGD_DIR", ((PHP_PGO.length == 0 || PHP_PGO == "yes") ? "$(BUILD_DIR)" : PHP_PGO));
 }
 

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 489aa09bd5572cf568d18c17476278b694147e1a..490f86457358e70ab5006b03e4b32d7b431edd7a 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1082,6 +1082,16 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
        }\r
        \r
        if(is_pgo_desired(sapiname) && (PHP_PGI == "yes" || PHP_PGO != "no")) {\r
+               // Add compiler and link flags if PGO options are selected\r
+               if (PHP_DEBUG != "yes" && PHP_PGI == "yes") {\r
+                       ADD_FLAG('CFLAGS_' + SAPI, "/GL /O2");\r
+                       ADD_FLAG('LDFLAGS_' + SAPI, "/LTCG:PGINSTRUMENT");\r
+               }\r
+               else if (PHP_DEBUG != "yes" && PHP_PGO != "no") {\r
+                       ADD_FLAG('CFLAGS_' + SAPI, "/GL /O2");\r
+                       ADD_FLAG('LDFLAGS_' + SAPI, "/LTCG:PGUPDATE");\r
+               }\r
+\r
                ldflags += " /PGD:$(PGOPGD_DIR)\\" + makefiletarget.substring(0, makefiletarget.indexOf(".")) + ".pgd";\r
        }\r
 \r
@@ -1268,6 +1278,16 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
 \r
                ldflags = "";\r
                if (is_pgo_desired(extname) && (PHP_PGI == "yes" || PHP_PGO != "no")) {\r
+                       // Add compiler and link flags if PGO options are selected\r
+                       if (PHP_DEBUG != "yes" && PHP_PGI == "yes") {\r
+                               ADD_FLAG('LDFLAGS_' + EXT, "/LTCG:PGINSTRUMENT");\r
+                       }\r
+                       else if (PHP_DEBUG != "yes" && PHP_PGO != "no") {\r
+                               ADD_FLAG('LDFLAGS_' + EXT, "/LTCG:PGUPDATE");\r
+                       }\r
+\r
+                       ADD_FLAG('CFLAGS_' + EXT, "/GL /O2");\r
+\r
                        ldflags = " /PGD:$(PGOPGD_DIR)\\" + dllname.substring(0, dllname.indexOf(".")) + ".pgd";\r
                }\r
 \r