From: Ryan Bloom <rbb@apache.org>
Date: Thu, 5 Oct 2000 17:28:45 +0000 (+0000)
Subject: Back out the build changes I added last night.  This was causing libtool
X-Git-Tag: APACHE_2_0_ALPHA_7~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73369a1dced2284c53c1c349d04f659fda21bcb5;p=apache

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 173375eba3..ea0117a561 100644
--- 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 92c6b806c8..97177b60bb 100644
--- 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