From 1310bb5e2ec3ab428b26396237dce82a506ba2b5 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 6 Nov 2014 23:43:36 +0100 Subject: [PATCH] using the determined linker instead of compiler this is a clang issue, longer parameter strings would be issue for both compiler and linker --- win32/build/Makefile | 3 ++- win32/build/config.w32 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/win32/build/Makefile b/win32/build/Makefile index b2918b7117..90f02d2494 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -89,7 +89,8 @@ $(PHPDLL_RES): win32\build\template.rc win32\build\template.rc $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE) - @$(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) +# @$(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) + @"$(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) -@$(_VC_MANIFEST_EMBED_DLL) $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL) diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 7305b480dc..5af43734f0 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -233,7 +233,7 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') { // General link flags -if (VS_TOOLSET || CLANG_TOOLSET) { +if (VS_TOOLSET) { if (VCVERS >= 1700) { DEFINE("LDFLAGS", "/nologo "); } else { -- 2.50.1