com php-src: separate LDFLAGS and ARFLAGS to fix the unknown opts warns: win32/build/config.w32 win32/build/config.w32.phpize.in
win32/build/confutils.js
| From: | Anatol Belski | Date: | Fri, 14 Nov 2014 16:39:42 +0000 |
| Subject: | com php-src: separate LDFLAGS and ARFLAGS to fix the unknown opts warns: win32/build/config.w32 win32/build/config.w32.phpize.in win32/build/confutils.js |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83093@lists.php.net to get a copy of this message | ||
Commit: 034a88135f325b15ccfd8726f13b7501aaa03858
Author: Anatol Belski <ab@php.net> Fri, 14 Nov 2014 13:57:57 +0100
Parents: a85ce501da60999ded0f93d9889efa6792b2a6ec
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=034a88135f325b15ccfd8726f13b7501aaa03858
Log:
separate LDFLAGS and ARFLAGS to fix the unknown opts warns
Changed paths:
M win32/build/config.w32
M win32/build/config.w32.phpize.in
M win32/build/confutils.js
Diff:
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 148ab67..7ca0293 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -107,6 +107,7 @@ var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '"
');
ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '"
');
+ADD_FLAG("ARFLAGS", '/libpath:"' + php_usual_lib_suspects + '"
');
probe_basic_headers();
add_extra_dirs();
diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 97f1f7d..a340af0 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -91,6 +91,7 @@ var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '"
');
ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects +
'\\"" ');
+ADD_FLAG("ARFLAGS", '/libpath:"\\"' + php_usual_lib_suspects +
'\\"" ');
probe_basic_headers();
add_extra_dirs();
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index f201f48..bcf0d1d 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -716,6 +716,7 @@ function CHECK_LIB(libnames, target, path_to_check, common_name)
var libdir = FSO.GetParentFolderName(location);
libname = FSO.GetFileName(location);
ADD_FLAG("LDFLAGS" + target, '/libpath:"' + libdir + '"
');
+ ADD_FLAG("ARFLAGS" + target, '/libpath:"' + libdir + '"
');
ADD_FLAG("LIBS" + target, libname);
STDOUT.WriteLine(location);
@@ -785,6 +786,7 @@ function OLD_CHECK_LIB(libnames, target, path_to_check)
if (typeof(p) == "string") {
ADD_FLAG("LDFLAGS" + target, '/libpath:"' + p + '" ');
+ ADD_FLAG("ARFLAGS" + target, '/libpath:"' + p + '" ');
ADD_FLAG("LIBS" + target, libname);
have = 1;
} else if (p == true) {
@@ -1096,7 +1098,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
ldflags = "/dll $(LDFLAGS)";
manifest = "-@$(_VC_MANIFEST_EMBED_DLL)";
} else if (makefiletarget.match(new RegExp("\\.lib$"))) {
- ldflags = "$(LDFLAGS)";
+ ldflags = "$(ARFLAGS)";
ld = "$(MAKE_LIB)";
} else {
ldflags = "$(LDFLAGS)";
@@ -1119,14 +1121,14 @@ 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_RESP) $(PHPLIB)
$(LDFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
+ MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS_RESP) $(PHPLIB)
$(ARFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
} else {
ld = '@"$(LINK)"';
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_RESP) $(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)
$(ARFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
} else {
ld = '@"$(LINK)"';
MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS_RESP) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\"
+ resname + " /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + "
$(LDFLAGS_" + SAPI + ")");
@@ -2785,8 +2787,10 @@ function add_extra_dirs()
if (FSO.FolderExists(f)) {
if (VS_TOOLSET && VCVERS <= 1200 && f.indexOf(" ") >= 0) {
ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\""
');
+ ADD_FLAG("ARFLAGS", '/libpath:"\\"' + f + '\\""
');
} else {
ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
+ ADD_FLAG("ARFLAGS", '/libpath:"' + f + '" ');
}
}
}