archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Propogate LDFLAGS from extensions to PHPDLL when building them statically.

Browse source 
Move ZendEngine2 to Zend while running buildconf
This commit is contained in:
Wez Furlong 2003-12-03 14:55:03 +00:00
parent ad84dfa937
commit 93bce45485
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win32/build/Makefile
View file

@ -43,7 +43,7 @@ Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l
flex -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
$(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS)
$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)

11
win32/build/buildconf.js
View file

@ -1,4 +1,4 @@
// $Id: buildconf.js,v 1.1 2003-12-02 23:17:04 wez Exp $
// $Id: buildconf.js,v 1.2 2003-12-03 14:55:03 wez Exp $
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
/* $Id: buildconf.js,v 1.1 2003-12-02 23:17:04 wez Exp $ */
/* $Id: buildconf.js,v 1.2 2003-12-03 14:55:03 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@ -49,6 +49,13 @@ function find_config_w32(dirname)
}
}
if (FSO.FileExists("ZendEngine2\\OBJECTS2_HOWTO")) {
if (FSO.FolderExists("Zend")) {
FSO.MoveFolder("Zend", "ZendEngine1");
}
FSO.MoveFolder("ZendEngine2", "Zend");
}
// Write the head of the configure script
C.WriteLine("/* This file automatically generated from win32/build/confutils.js */");
C.Write(file_get_contents("win32/build/confutils.js"));

5
win32/build/confutils.js
View file

@ -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,