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 bea3a0a2bcceef056114af098469fdd5198af070..ffb895075c2e3666545ceb4f0f566ba5318dc0da 100644 (file)
--- 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 09c95a8a027165fd399ed21d38e7890367a5b4ad..9a3747a4644fbfabbd993942e9546d50f52a1aad 100644 (file)
--- 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