File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -89,7 +89,8 @@ $(PHPDLL_RES): win32\build\template.rc
89
89
win32\b uild\t emplate.rc
90
90
91
91
$(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)
93
94
-@$(_VC_MANIFEST_EMBED_DLL)
94
95
95
96
$(BUILD_DIR ) \$(PHPLIB ) : $(BUILD_DIR ) \$(PHPDLL )
Original file line number Diff line number Diff line change @@ -233,7 +233,7 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
233
233
234
234
// General link flags
235
235
236
- if ( VS_TOOLSET || CLANG_TOOLSET ) {
236
+ if ( VS_TOOLSET ) {
237
237
if ( VCVERS >= 1700 ) {
238
238
DEFINE ( "LDFLAGS" , "/nologo " ) ;
239
239
} else {
You can’t perform that action at this time.
0 commit comments