From: Jeff Trawick <trawick@apache.org>
Date: Mon, 3 Jun 2002 15:25:11 +0000 (+0000)
Subject: On OS/390, the compiler/linker front-end doesn't handle
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e90be3e85c5246a5e7938b907d485e5510080850;p=apache

On OS/390, the compiler/linker front-end doesn't handle
"-L/path/to/lib after "-o target".  After looking into build failures,
it turned out that we specify EXTRA_LDFLAGS twice (once before "-o
target" and once after "-o target") for httpd and for the support
utilities.


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

diff --git a/Makefile.in b/Makefile.in
index bea3a0a2bc..ffb895075c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,8 +4,7 @@ CLEAN_SUBDIRS = test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(HTTPD_LDFLAGS) \
-                       $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
 PROGRAM_DEPENDENCIES = \
   $(BUILTIN_LIBS) \
   $(MPM_LIB) \
diff --git a/support/Makefile.in b/support/Makefile.in
index 09c95a8a02..9a3747a464 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -4,7 +4,7 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
 PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm
 TARGETS  = $(PROGRAMS)
 
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
 PROGRAM_DEPENDENCIES = 
 
 include $(top_builddir)/build/rules.mk