Commit c9fd8830 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Begining stub of NONAC_LDFLAGS and NONAC_CFLAGS stuff. 

First of all, avoid re-adding values to the various hints
each time called (not a problem now, but could be later).
Then build up CFLAGS/LDFLAGS during Makefile generation.

PR:
Obtained from:
Submitted by:
Reviewed by:


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

build/fastgen.sh

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ top_builddir = $top_builddir 
srcdir       = $top_srcdir/$dir

builddir     = $top_builddir/$dir

VPATH        = $top_srcdir/$dir

NONAC_CFLAGS  = "$NONAC_CFLAGS"

NONAC_LDFLAGS = "$NONAC_LDFLAGS"

EOF

    

    test -z "$dir" && dir="."

build/rules.mk

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ include $(top_builddir)/config_vars.mk 
# Compile commands



COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)

COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)

COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NONAC_CFLAGS)

CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)



SH_COMPILE     = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
@@ -70,9 +70,9 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ 


# Link-related commands



LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) -o $@

LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@



# Cross compile commands

hints.m4

+8 −4
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ dnl Preload various ENV/makefile paramsm such as CC, CFLAGS, etc 
dnl  based on outside knowledge

dnl

AC_DEFUN(APACHE_PRELOAD, [

echo "Applying hints file rules for $host"

if test "$DID_APACHE_PRELOAD" != "yes" ; then

  DID_APACHE_PRELOAD="yes"; export DID_APACHE_PRELOAD



  echo "Applying Apache hints file rules for $host"



  case "$host" in

    *-apple-aux3*)
@@ -51,4 +54,5 @@ dnl ;; 
        ;;

  esac

  APR_DOEXTRA

fi

])