com php-src: using the determined linker instead of compiler: win32/build/Makefile win32/build/config.w32

Commit: 1310bb5e2ec3ab428b26396237dce82a506ba2b5 Author: Anatol Belski <ab@php.net> Thu, 6 Nov 2014 23:43:36 +0100 Parents: ac71c5812b9246edbae7c9fe8281c1186c1b9a4a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1310bb5e2ec3ab428b26396237dce82a506ba2b5 Log: using the determined linker instead of compiler this is a clang issue, longer parameter strings would be issue for both compiler and linker Changed paths: M win32/build/Makefile M win32/build/config.w32 Diff: diff --git a/win32/build/Makefile b/win32/build/Makefile index b2918b7..90f02d2 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 7305b48..5af4373 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 {