From: Anatol Belski <ab@php.net>
Date: Fri, 14 Nov 2014 12:57:57 +0000 (+0100)
Subject: separate LDFLAGS and ARFLAGS to fix the unknown opts warns
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~46^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=034a88135f325b15ccfd8726f13b7501aaa03858;p=php

separate LDFLAGS and ARFLAGS to fix the unknown opts warns
---

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 148ab6783c..7ca0293f3f 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 97f1f7d638..a340af0e60 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 f201f48e86..bcf0d1dac9 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 + '" ');
 				}
 			}
 		}