Skip to content

Commit 1310bb5

Browse files
committed
using the determined linker instead of compiler
this is a clang issue, longer parameter strings would be issue for both compiler and linker
1 parent ac71c58 commit 1310bb5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

win32/build/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ $(PHPDLL_RES): win32\build\template.rc
8989
win32\build\template.rc
9090

9191
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
92-
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP7_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
92+
# @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP7_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
93+
@"$(LINK)" $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP7_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
9394
-@$(_VC_MANIFEST_EMBED_DLL)
9495

9596
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)

win32/build/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
233233

234234
// General link flags
235235

236-
if (VS_TOOLSET || CLANG_TOOLSET) {
236+
if (VS_TOOLSET) {
237237
if (VCVERS >= 1700) {
238238
DEFINE("LDFLAGS", "/nologo ");
239239
} else {

0 commit comments

Comments
 (0)