diff options
| author | Wez Furlong <wez@php.net> | 2004-01-08 00:25:48 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-01-08 00:25:48 +0000 |
| commit | 4a17522353f35e35b5b32f93b04e21a810141f9d (patch) | |
| tree | 6fb40affd340fbc48eb0077ec41040e7f0b6bcac | |
| parent | b4fab399f768ab11227837f0c5414470a7eee89c (diff) | |
| download | php-git-4a17522353f35e35b5b32f93b04e21a810141f9d.tar.gz | |
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.
| -rw-r--r-- | win32/build/confutils.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 8d8b128330..7be922db52 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -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 @@ function ADD_SOURCES(dir, file_list, target) } } 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); |