Author: brane
Date: Thu Dec 20 13:59:14 2012
New Revision: 1424466
URL: http://svn.apache.org/viewvc?rev=1424466&view=rev
Log:
[On the tweak-build-take-two branch]
Propagate C(XX)FLAGS set in the environment during configure time to the
generated makefile and append them to whatever flags were generated.
* build/ac-macros/compiler.m4 (SVN_PROG_CC): Store intiial CFLAGS in CUSERFLAGS.
(SVN_PROG_CXX): Do the same with CXXFLAGS and CXXUSERFLAGS.
* Makefile.in: Append CUSERFLAGS and CXXUSERFLAGS to compiler invocations.
Modified:
subversion/branches/tweak-build-take-two/Makefile.in
subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4
Modified: subversion/branches/tweak-build-take-two/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/Makefile.in?rev=1424466&r1=1424465&r2=1424466&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/Makefile.in (original)
+++ subversion/branches/tweak-build-take-two/Makefile.in Thu Dec 20 13:59:14
2012
@@ -169,9 +169,11 @@ DOXYGEN = @DOXYGEN@
# The EXTRA_ parameters can be used to pass extra flags at 'make' time.
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
+CUSERFLAGS = @CUSERFLAGS@
CMODEFLAGS = @CMODEFLAGS@
CMAINTAINERFLAGS = @CMAINTAINERFLAGS@
CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
+CXXUSERFLAGS = @CXXUSERFLAGS@
CXXMODEFLAGS = @CXXMODEFLAGS@
CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS@
### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes,
@@ -181,8 +183,8 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
-COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS)
$(INCLUDES)
-COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS)
$(CXXFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS)
$(CUSERFLAGS) $(INCLUDES)
+COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS)
$(CXXFLAGS) $(CXXUSERFLAGS) $(INCLUDES)
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(LT_CFLAGS)
LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX)
$(LT_CFLAGS)
@@ -190,12 +192,12 @@ LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS
LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in
$(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done`
# special compilation for files destined for mod_dav_svn
-COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CMODEFLAGS)
$(CPPFLAGS) $(CFLAGS) $(CMAINTAINERFLAGS) $(LT_CFLAGS) $(APACHE_INCLUDES)
$(INCLUDES) -o $@ -c
+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CMODEFLAGS)
$(CPPFLAGS) $(CFLAGS) $(CMAINTAINERFLAGS) $(CUSERFLAGS) $(LT_CFLAGS)
$(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
# special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
-COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE)
$(CPPFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
-COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS)
$(CFLAGS) $(LT_CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
-COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE)
$(CPPFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE)
$(CPPFLAGS) $(CUSERFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES)
$(INCLUDES) -o $@ -c
+COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS)
$(CFLAGS) $(CUSERFLAGS) $(LT_CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE)
$(CPPFLAGS) $(CUSERFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
# special compilation for files destined for javahl (i.e. C++)
COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX)
$(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
Modified: subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4?rev=1424466&r1=1424465&r2=1424466&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4
(original)
+++ subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4 Thu
Dec 20 13:59:14 2012
@@ -55,11 +55,13 @@ AC_DEFUN([SVN_CXXFLAGS_ADD_IFELSE],
AC_DEFUN([SVN_PROG_CC],
[
- AC_PROG_CC
-
- CFLAGS_KEEP="$CFLAGS"
+ dnl Keep user-supplied compiler flags separate
+ AC_SUBST(CUSERFLAGS)
+ CUSERFLAGS="$CFLAGS"
CFLAGS=""
+ AC_PROG_CC
+
dnl Find flags to force C90 mode
dnl gcc and clang
SVN_CFLAGS_ADD_IFELSE([-std=c90],[],[
@@ -70,22 +72,24 @@ AC_DEFUN([SVN_PROG_CC],
AC_SUBST(CMODEFLAGS)
CMODEFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS_KEEP"
+ CFLAGS=""
])
AC_DEFUN([SVN_PROG_CXX],
[
- AC_PROG_CXX
-
- CXXFLAGS_KEEP="$CXXFLAGS"
+ dnl Keep user-supplied compiler flags separate
+ AC_SUBST(CXXUSERFLAGS)
+ CXXUSERFLAGS="$CXXFLAGS"
CXXFLAGS=""
+ AC_PROG_CXX
+
dnl Find flags to force C++98 mode
dnl g++ and clang++
SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
AC_SUBST(CXXMODEFLAGS)
CXXMODEFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS_KEEP"
+ CXXFLAGS=""
])
