wez Wed Jan 7 19:25:49 2004 EDT
Modified files:
/php-src/win32/build confutils.js
Log:
Change ordering of CFLAGS for built sources, so that extension specific include dirs
occur before more global include dirs.
This avoids problems when building a bundled lib and you have headers from an
external version of that lib in your global include dir.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.31 php-src/win32/build/confutils.js:1.32
--- php-src/win32/build/confutils.js:1.31 Wed Jan 7 15:06:32 2004
+++ php-src/win32/build/confutils.js Wed Jan 7 19:25:48 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.31 2004/01/07 20:06:32 wez Exp $
+// $Id: confutils.js,v 1.32 2004/01/08 00:25:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -952,13 +952,13 @@
}
} else {
MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + src);
- MFO.WriteLine("\t$(CC) $(CFLAGS) $(" + flags + ") $(" +
bd_flags_name + ") -c " + dir + "\\" + src + " -o " + sub_build + obj);
+ MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" +
bd_flags_name + ") -c " + dir + "\\" + src + " -o " + sub_build + obj);
}
}
if (PHP_ONE_SHOT == "yes") {
MFO.WriteLine(objs_line + ": " + srcs_line);
- MFO.WriteLine("\t$(CC) $(CFLAGS) $(" + flags + ") $(" + bd_flags_name
+ ") -c " + srcs_line);
+ MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name
+ ") -c " + srcs_line);
}
DEFINE(sym, tv);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
