separate LDFLAGS and ARFLAGS to fix the unknown opts warns

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 148ab6783cb9dbbcb58f8340580e60de695a709f..7ca0293f3fc55593cf3a73eef733d5e8c15ce9f7 100644 (file)
--- 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 97f1f7d638821c17f98abef16817776dcc8d4afd..a340af0e60ad1f134caf8941ef8ff3cbebf26ba0 100644 (file)
--- 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";
 \r
 ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');\r
 ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');\r
+ADD_FLAG("ARFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');\r
 \r
 probe_basic_headers();\r
 add_extra_dirs();\r

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index f201f48e86bede397602f0700735941033a10a95..bcf0d1dac92a5117c29e2ed3964e9133c7f16053 100644 (file)
--- 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 + '" ');
                                }
                        }
                }