configure: append --extra-cflags to final set

previously any flags added while setting up the toolchain would
override the user selections; environment variables could be treated
similarly

Change-Id: Ibfcc644137d8e579af554d19a38d4020019a7a34

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 688fa12c52a36357f0baf1c5d5421a9a1b71ac4e..907b47318de1301e32048da5626e515dea33786e 100644 (file)
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1323,12 +1323,6 @@ EOF
     add_cflags -D_LARGEFILE_SOURCE
     add_cflags -D_FILE_OFFSET_BITS=64
   fi
-
-  # append any user defined extra cflags
-  if [ -n "${extra_cflags}" ] ; then
-    check_add_cflags ${extra_cflags} || \
-    die "Requested extra CFLAGS '${extra_cflags}' not supported by compiler"
-  fi
 }
 
 process_toolchain() {

diff --git a/configure b/configure
index ac196dacb10e068b3176f219bb052001da38b086..30a5c119209e2f4cab95ab1661b3b5161613a766 100755 (executable)
--- a/configure
+++ b/configure
@@ -716,6 +716,12 @@ EOF
     esac
     # libwebm needs to be linked with C++ standard library
     enabled webm_io && LD=${CXX}
+
+    # append any user defined extra cflags
+    if [ -n "${extra_cflags}" ] ; then
+        check_add_cflags ${extra_cflags} || \
+        die "Requested extra CFLAGS '${extra_cflags}' not supported by compiler"
+    fi
 }