Configure: respecting user provided CFLAGS.

See https://www.gnu.org/prep/standards/html_node/Command-Variables.html
and discussion in #990 issue on Github.

diff --git a/auto/make b/auto/make
index 928d41d36020f74f474d5210c2d2c925a8b77666..296ff5a8d4a7145385346ddad4d3829195b8a3cb 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -90,7 +90,7 @@ NJS_CC = ${CC}
 NJS_STATIC_LINK = ${AR} -r -c
 NJS_LINK = ${CC} ${NJS_LD_OPT}
 NJS_PIC = ${NJS_PIC}
-NJS_CFLAGS = ${NJS_CFLAGS} ${NJS_CC_OPT} ${CFLAGS}
+CFLAGS = ${NJS_CC_OPT} ${CFLAGS:-${NJS_CFLAGS}}
 NJS_LIB_AUX_CFLAGS = ${NJS_LIB_AUX_CFLAGS}
 
 NJS_VER = $(grep NJS_VERSION src/njs.h | sed -e 's#.*"\(.*\)".*#\1#')
@@ -133,7 +133,7 @@ do
     cat << END >> $NJS_MAKEFILE
 
 $NJS_BUILD_DIR/$njs_obj: $njs_src
-       \$(NJS_CC) -c \$(NJS_LIB_INCS) \$(NJS_PIC) \$(NJS_CFLAGS) \\
+       \$(NJS_CC) -c \$(NJS_LIB_INCS) \$(NJS_PIC) \$(CFLAGS) \\
                \$(NJS_LIB_AUX_CFLAGS) \\
                -o $NJS_BUILD_DIR/$njs_obj \\
                $njs_dep_flags \\
@@ -155,7 +155,7 @@ do
     cat << END >> $NJS_MAKEFILE
 
 $NJS_BUILD_DIR/$njs_obj: $njs_src
-       \$(NJS_CC) -c \$(NJS_LIB_INCS) \$(NJS_PIC) \$(NJS_CFLAGS) \\
+       \$(NJS_CC) -c \$(NJS_LIB_INCS) \$(NJS_PIC) \$(CFLAGS) \\
                \$(NJS_LIB_AUX_CFLAGS) \\
                -o $NJS_BUILD_DIR/$njs_obj \\
                $njs_dep_flags \\
@@ -176,7 +176,7 @@ $NJS_BUILD_DIR/njs: \\
        $NJS_BUILD_DIR/libnjs.a $QJS_LIB \\
        external/njs_shell.c
        \$(NJS_LINK) -o $NJS_BUILD_DIR/njs \$(NJS_LIB_INCS) \\
-               \$(NJS_CFLAGS) \$(NJS_LIB_AUX_CFLAGS)\\
+               \$(CFLAGS) \$(NJS_LIB_AUX_CFLAGS)\\
                external/njs_shell.c \\
                $NJS_BUILD_DIR/libnjs.a $QJS_LIB \\
                $NJS_LD_OPT -lm $NJS_LIBS $NJS_LIB_AUX_LIBS $NJS_READLINE_LIB
@@ -221,7 +221,7 @@ do
 $NJS_BUILD_DIR/$njs_bin: $njs_src \\
        $NJS_BUILD_DIR/libnjs.a
        \$(NJS_LINK) -o $NJS_BUILD_DIR/$njs_bin \$(NJS_LIB_INCS) \\
-               \$(NJS_CFLAGS) $njs_dep_flags \\
+               \$(CFLAGS) $njs_dep_flags \\
                $njs_src $NJS_BUILD_DIR/libnjs.a \\
                $njs_dep_post -lm $NJS_LD_OPT
 
@@ -245,7 +245,7 @@ cat << END >> $NJS_MAKEFILE
 
 $NJS_BUILD_DIR/$njs_externals_obj: \\
     $njs_src
-       \$(NJS_CC) -c \$(NJS_LIB_INCS) \$(NJS_CFLAGS) \\
+       \$(NJS_CC) -c \$(NJS_LIB_INCS) \$(CFLAGS) \\
                \$(NJS_LIB_AUX_CFLAGS) \\
                -o $NJS_BUILD_DIR/$njs_externals_obj \\
                $njs_dep_flags \\
@@ -269,7 +269,7 @@ $NJS_BUILD_DIR/$njs_bin: $njs_src \\
        $NJS_BUILD_DIR/libnjs.a \\
        $NJS_BUILD_DIR/$njs_externals_obj
        \$(NJS_LINK) -o $NJS_BUILD_DIR/$njs_bin \$(NJS_LIB_INCS) \\
-               \$(NJS_CFLAGS) \$(NJS_LIB_AUX_CFLAGS) \\
+               \$(CFLAGS) \$(NJS_LIB_AUX_CFLAGS) \\
                $njs_dep_flags \\
                $NJS_BUILD_DIR/$njs_externals_obj \\
                $njs_src $NJS_BUILD_DIR/libnjs.a \\

diff --git a/auto/options b/auto/options
index d2fadbd0576603326bafb481b36a5f1cf442f07c..49d980192e6f33aa9cbaf369b988cc77d59dcb57 100644 (file)
--- a/auto/options
+++ b/auto/options
@@ -3,8 +3,8 @@
 # Copyright (C) NGINX, Inc.
 
 
-NJS_CC_OPT=${NJS_CC_OPT:--O}
-NJS_LD_OPT=${NJS_CC_OPT:--O}
+NJS_CC_OPT=
+NJS_LD_OPT=
 NJS_PIC=-fPIC
 
 NJS_DEBUG=NO

diff --git a/auto/summary b/auto/summary
index f540f11ec55b80b96e28417fb90bf75f59b7629e..59d70428c277309843cbe4135ce51483b18e48a2 100644 (file)
--- a/auto/summary
+++ b/auto/summary
@@ -7,7 +7,7 @@ echo
 echo "NJS configuration summary:"
 echo
 echo " + using CC: \"$CC\""
-echo " + using CFLAGS: \"$NJS_CFLAGS $NJS_CC_OPT $CFLAGS\""
+echo " + using CFLAGS: \"$NJS_CC_OPT ${CFLAGS:-$NJS_CFLAGS}\""
 echo
 
 if [ $NJS_HAVE_PCRE = YES ]; then