using the determined linker instead of compiler

this is a clang issue, longer parameter strings would be issue for both
compiler and linker

diff --git a/win32/build/Makefile b/win32/build/Makefile
index b2918b7117c0d3feddcbcea1e9fea52e5e456d79..90f02d24943f08d494fbb42323902a607ba304d8 100644 (file)
--- 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 7305b480dcaeadf9fa47c7f1096d09715053bfb0..5af43734f0c14396dbe9e3a1201388f769f745a7 100644 (file)
--- 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 {