Commit e90be3e8 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 287466b0

Makefile.in

+1 −2
Changes for Makefile.in: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -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) \

support/Makefile.in

+1 −1
Changes for support/Makefile.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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