From 43a34557f15219295287544dd14ed9cdfb0e4726 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 26 Aug 2015 20:28:26 -0700
Subject: [PATCH] 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
---
 build/make/configure.sh | 6 ------
 configure               | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 688fa12c5..907b47318 100644
--- 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 ac196dacb..30a5c1192 100755
--- 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
 }
 
 
-- 
GitLab