com php-src: use response files for exts and sapi linking: win32/build/confutils.js
| From: | Anatol Belski | Date: | Wed, 12 Nov 2014 16:57:17 +0000 |
| Subject: | com php-src: use response files for exts and sapi linking: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83063@lists.php.net to get a copy of this message | ||
Commit: 988112a2e186cbef70b4b347db7def1c7f48cce6
Author: Anatol Belski <ab@php.net> Wed, 12 Nov 2014 17:16:09 +0100
Parents: 1acbcdeb27abefa1a6966a8d791fa2707931b79f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=988112a2e186cbef70b4b347db7def1c7f48cce6
Log:
use response files for exts and sapi linking
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 201c368...80a5416 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1120,17 +1120,17 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
if (MODE_PHPIZE) {
if (ld) {
- MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(PHPLIB) $(LDFLAGS_" +
SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
+ MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS_RESP) $(PHPLIB)
$(LDFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
} else {
ld = '@"$(LINK)"';
- MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS) $(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname + "
/out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + " $(LDFLAGS_" +
SAPI + ")");
+ MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS_RESP) $(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname +
" /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + "
$(LDFLAGS_" + SAPI + ")");
}
} else {
if (ld) {
- MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)
$(LDFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
+ MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS_RESP) $(BUILD_DIR)\\$(PHPLIB)
$(LDFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
} else {
ld = '@"$(LINK)"';
- MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" +
resname + " /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + "
$(LDFLAGS_" + SAPI + ")");
+ MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS_RESP) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\"
+ resname + " /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + "
$(LDFLAGS_" + SAPI + ")");
}
}
@@ -1316,10 +1316,10 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
MFO.WriteBlankLines(1);
if (MODE_PHPIZE) {
MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(DEPS_" + EXT + ")
$(" + EXT + "_GLOBAL_OBJS) $(PHPLIB) $(BUILD_DIR)\\" + resname);
- MFO.WriteLine("\t" + ld + " $(" + EXT + "_GLOBAL_OBJS) $(PHPLIB)
$(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname + "
/out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT +
")");
+ MFO.WriteLine("\t" + ld + " $(" + EXT + "_GLOBAL_OBJS_RESP) $(PHPLIB)
$(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname + "
/out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT +
")");
} else {
MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(DEPS_" + EXT + ")
$(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname);
- MFO.WriteLine("\t" + ld + " $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname +
" /out:$(BUILD_DIR)\\" + dllname + ldflags + " $(DLL_LDFLAGS) $(LDFLAGS)
$(LDFLAGS_" + EXT + ")");
+ MFO.WriteLine("\t" + ld + " $(" + EXT + "_GLOBAL_OBJS_RESP)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname +
" /out:$(BUILD_DIR)\\" + dllname + ldflags + " $(DLL_LDFLAGS) $(LDFLAGS)
$(LDFLAGS_" + EXT + ")");
}
MFO.WriteLine("\t-@$(_VC_MANIFEST_EMBED_DLL)");
MFO.WriteBlankLines(1);