Skip to content

Commit bc16dee

Browse files
committed
Revert "Enable whole program optimization for builds without PGO, too"
This reverts commit f052e99. There appear to be link issues with upcoming 19.11 and /LTCG, prefer wider dependency compatibility.
1 parent d9f7288 commit bc16dee

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

win32/build/confutils.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,9 +1229,6 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
12291229
}
12301230

12311231
ldflags += " /PGD:$(PGOPGD_DIR)\\" + makefiletarget.substring(0, makefiletarget.indexOf(".")) + ".pgd";
1232-
} else if (PHP_DEBUG != "yes") {
1233-
ADD_FLAG('CFLAGS_' + SAPI, "/GL");
1234-
ADD_FLAG('LDFLAGS_' + SAPI, "/LTCG:INCREMENTAL");
12351232
}
12361233

12371234
if (MODE_PHPIZE) {
@@ -1432,9 +1429,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
14321429
ADD_FLAG('CFLAGS_' + EXT, "/GL /O2");
14331430

14341431
ldflags = " /PGD:$(PGOPGD_DIR)\\" + dllname.substring(0, dllname.indexOf(".")) + ".pgd";
1435-
} else if (PHP_DEBUG != "yes") {
1436-
ADD_FLAG('CFLAGS_' + EXT, "/GL");
1437-
ADD_FLAG('LDFLAGS_' + EXT, "/LTCG:INCREMENTAL");
14381432
}
14391433

14401434
MFO.WriteLine("$(BUILD_DIR)\\" + libname + ": $(BUILD_DIR)\\" + dllname);
@@ -1477,9 +1471,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
14771471
ADD_FLAG("STATIC_EXT_CFLAGS", "/GL /O2");
14781472
static_pgo_enabled = true;
14791473
}
1480-
} else if (PHP_DEBUG != "yes") {
1481-
ADD_FLAG("STATIC_EXT_CFLAGS", "/GL");
1482-
ADD_FLAG('STATIC_EXT_LDFLAGS', "/LTCG:INCREMENTAL");
14831474
}
14841475

14851476
/* find the header that declares the module pointer,

0 commit comments

Comments
 (0)