diff options
| author | Wez Furlong <wez@php.net> | 2003-12-03 14:55:03 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-03 14:55:03 +0000 |
| commit | 93bce454857f81f082dc6c3f7a5f6dc3ec7072df (patch) | |
| tree | 79ddf23bb5df1b5d289e9e59fff45ab4b9ac8420 /win32/build/confutils.js | |
| parent | ad84dfa9375a64d8521484600ffe7df15e58a083 (diff) | |
| download | php-git-93bce454857f81f082dc6c3f7a5f6dc3ec7072df.tar.gz | |
Propogate LDFLAGS from extensions to PHPDLL when building them statically.
Move ZendEngine2 to Zend while running buildconf
Diffstat (limited to 'win32/build/confutils.js')
| -rw-r--r-- | win32/build/confutils.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index dbcc5d7402..97b9e9b496 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.5 2003-12-03 14:29:45 wez Exp $ +// $Id: confutils.js,v 1.6 2003-12-03 14:55:03 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -473,7 +473,7 @@ function EXTENSION(extname, file_list, shared, cflags) if (shared) { dllname = "php_" + extname + ".dll"; MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)"); - MFO.WriteLine("\t$(LD) /out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(" + EXT + "_LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS)"); + MFO.WriteLine("\t$(LD) /out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS)"); MFO.WriteBlankLines(1); ADD_FLAG("EXT_TARGETS", dllname); @@ -483,6 +483,7 @@ function EXTENSION(extname, file_list, shared, cflags) } else { ADD_FLAG("STATIC_EXT_OBJS", "$(" + EXT + "_GLOBAL_OBJS)"); ADD_FLAG("STATIC_EXT_LIBS", "$(LIBS_" + EXT + ")"); + ADD_FLAG("STATIC_EXT_LDFLAGS", "$(LDFLAGS_" + EXT + ")"); ADD_FLAG("CFLAGS_" + EXT, "$(CFLAGS_PHP)"); /* find the header that declars the module pointer, |