cvs: php4 /build library.mk program.mk rules_common.mk
| From: | Sascha Schumann | Date: | Thu, 09 Aug 2001 04:27:40 +0000 |
| Subject: | cvs: php4 /build library.mk program.mk rules_common.mk | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6667@lists.php.net to get a copy of this message | ||
sas Thu Aug 9 00:27:40 2001 EDT
Modified files:
/php4/build library.mk program.mk rules_common.mk
Log:
Workaround which avoids passing pic-related flags in link mode
Index: php4/build/library.mk
diff -u php4/build/library.mk:1.8 php4/build/library.mk:1.9
--- php4/build/library.mk:1.8 Sun Aug 20 01:36:07 2000
+++ php4/build/library.mk Thu Aug 9 00:27:40 2001
@@ -14,10 +14,10 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: library.mk,v 1.8 2000/08/20 05:36:07 sas Exp $
+# $Id: library.mk,v 1.9 2001/08/09 04:27:40 sas Exp $
#
LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
- $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
+ $(LINK_CLEAN) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
Index: php4/build/program.mk
diff -u php4/build/program.mk:1.3 php4/build/program.mk:1.4
--- php4/build/program.mk:1.3 Sun Aug 20 01:36:07 2000
+++ php4/build/program.mk Thu Aug 9 00:27:40 2001
@@ -14,10 +14,10 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: program.mk,v 1.3 2000/08/20 05:36:07 sas Exp $
+# $Id: program.mk,v 1.4 2001/08/09 04:27:40 sas Exp $
#
PROGRAM_OBJECTS = $(PROGRAM_SOURCES:.c=.lo)
$(PROGRAM_NAME): $(PROGRAM_DEPENDENCIES) $(PROGRAM_OBJECTS)
- $(LINK) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)
+ $(LINK_CLEAN) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)
Index: php4/build/rules_common.mk
diff -u php4/build/rules_common.mk:1.8 php4/build/rules_common.mk:1.9
--- php4/build/rules_common.mk:1.8 Fri May 18 10:40:02 2001
+++ php4/build/rules_common.mk Thu Aug 9 00:27:40 2001
@@ -14,7 +14,7 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: rules_common.mk,v 1.8 2001/05/18 14:40:02 thies Exp $
+# $Id: rules_common.mk,v 1.9 2001/08/09 04:27:40 sas Exp $
#
include $(top_builddir)/config_vars.mk
@@ -27,6 +27,7 @@
CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN)
-prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@
LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK_CLEAN = $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(LDFLAGS) -o $@
mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
INSTALL = $(top_srcdir)/build/shtool install -c