Use $(LINK) for libraries, but $(LINK_CLEAN) for creating programs.

Also pass only $(CFLAGS_CLEAN) into thttpd's Makefile.

diff --git a/build/library.mk b/build/library.mk
index 06b885b2bfb8f52c0167d34f54a8aa8b060bca1d..8cb86760e4e73dddabef5aea96f65ae6a8113311 100644 (file)
--- a/build/library.mk
+++ b/build/library.mk
@@ -20,4 +20,4 @@
 LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
 
 $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
-       $(LINK_CLEAN) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
+       $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)

diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index e7252332c23e02eeba57e65c3ce1213491747140..a96c5299fc1bdfdde1a6ec68baf42585aa670877 100644 (file)
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -7,7 +7,7 @@ AC_ARG_WITH(thttpd,
   INSTALL_IT="\
     echo 'PHP_LIBS = -L. -lphp4 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \
     echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $THTTPD/php_makefile; \
-    echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \
+    echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \
     \$(LN_S) $abs_srcdir/sapi/thttpd/thttpd.c $THTTPD/php_thttpd.c; \
     \$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\
     test -f $THTTPD/php_patched || \