diff options
| -rw-r--r-- | Makefile.config.in | 11 | ||||
| -rw-r--r-- | autoconf/configure.ac | 5 | ||||
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | docs/MakefileGuide.rst | 3 |
4 files changed, 29 insertions, 5 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index c751a0176d..d3b57e9f10 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -156,8 +156,17 @@ CXX = @CXX@ # Path to the CC binary, which use used by testcases for native builds. CC := @CC@ +# C/C++ preprocessor flags. +CPPFLAGS += @CPPFLAGS@ + +# C compiler flags. +CFLAGS += @CFLAGS@ + +# C++ compiler flags. +CXXFLAGS += @CXXFLAGS@ + # Linker flags. -LDFLAGS+=@LDFLAGS@ +LDFLAGS += @LDFLAGS@ # Path to the library archiver program. AR_PATH = @AR@ diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 4ca4eb9042..4c3af79edc 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -59,6 +59,11 @@ if test ${srcdir} != "." ; then fi fi +dnl Default to empty (i.e. assigning the null string to) CFLAGS and CXXFLAGS, +dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). +${CFLAGS=} +${CXXFLAGS=} + dnl We need to check for the compiler up here to avoid anything else dnl starting with a different one. AC_PROG_CC(clang llvm-gcc gcc) @@ -1981,6 +1981,9 @@ echo "$as_me: error: Already configured in ${srcdir}" >&2;} fi fi +${CFLAGS=} +${CXXFLAGS=} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5606,8 +5609,8 @@ case "$enableval" in x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; sparc) TARGETS_TO_BUILD="Sparc $TARGETS_TO_BUILD" ;; powerpc) TARGETS_TO_BUILD="PowerPC $TARGETS_TO_BUILD" ;; - arm) TARGETS_TO_BUILD="ARM $TARGETS_TO_BUILD" ;; aarch64) TARGETS_TO_BUILD="AArch64 $TARGETS_TO_BUILD" ;; + arm) TARGETS_TO_BUILD="ARM $TARGETS_TO_BUILD" ;; mips) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; mipsel) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; mips64) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; @@ -8716,7 +8719,9 @@ if test "${enable_ltdl_install+set}" = set; then fi - if test x"${enable_ltdl_install-no}" != xno; then + + +if test x"${enable_ltdl_install-no}" != xno; then INSTALL_LTDL_TRUE= INSTALL_LTDL_FALSE='#' else @@ -8724,7 +8729,9 @@ else INSTALL_LTDL_FALSE= fi - if test x"${enable_ltdl_convenience-no}" != xno; then + + +if test x"${enable_ltdl_convenience-no}" != xno; then CONVENIENCE_LTDL_TRUE= CONVENIENCE_LTDL_FALSE='#' else @@ -10491,7 +10498,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10493 "configure" +#line 10501 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/docs/MakefileGuide.rst b/docs/MakefileGuide.rst index f86d3e11e2..3e90907886 100644 --- a/docs/MakefileGuide.rst +++ b/docs/MakefileGuide.rst @@ -699,6 +699,9 @@ The override variables are given below: ``CFLAGS`` Additional flags to be passed to the 'C' compiler. +``CPPFLAGS`` + Additional flags passed to the C/C++ preprocessor. + ``CXX`` Specifies the path to the C++ compiler. |