Back out the build changes I added last night. This was causing libtool

commands to be sent to gcc.  It worked on some platforms, but not all of
them.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86404 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/rules.mk b/build/rules.mk
index 173375eba37660e168f69142bbcb23372f3909a7..ea0117a5613e1142cf54a95fe4a3d24282f263b0 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -75,14 +75,6 @@ SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
 
 # Cross compile commands
 
-ifeq (,$(CC_FOR_BUILD))
-CC_FOR_BUILD  = $(CC)
-endif
-
-BUILD_COMPILE    = $(CC_FOR_BUILD) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-BUILD_LT_COMPILE = $(BUILD_COMPILE) -c $< -o build-$(@:.lo=.o)
-BUILD_LINK       = $(BUILD_COMPILE) $(LTFLAGS) $(LDFLAGS) -o build-$@
-
 # Helper programs
 
 SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent

diff --git a/server/Makefile.in b/server/Makefile.in
index 92c6b806c8cc55b4282079397cc30972b5209dec..97177b60bbc4db179818b8d29af9284cf83a32d1 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -15,12 +15,10 @@ include $(top_srcdir)/build/ltlib.mk
 
 gen_uri_delims_OBJECTS = gen_uri_delims.lo
 gen_uri_delims: $(gen_uri_delims_OBJECTS)
-       $(BUILD_LINK) $(EXTRA_LDFLAGS) $(foreach f,$(gen_uri_delims_OBJECTS),build-$(f:.lo=.o)) $(EXTRA_LIBS)
        $(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
 
 gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo
 gen_test_char: $(gen_test_char_OBJECTS)
-       $(BUILD_LINK) $(EXTRA_LDFLAGS) $(foreach f,$(gen_test_char_OBJECTS),build-$(f:.lo=.o)) $(EXTRA_LIBS)
        $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
 
 $(gen_uri_delims_OBJECTS) $(gen_test_char_OBJECTS): %.lo: %.c