From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 10 Jun 2016 16:46:24 +0000 (+0100)
Subject: configure.ac: strip out the llvm-config -march/mtune flags
X-Git-Tag: android-x86-6.0-r1~207
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=766f8526165b62d7b43e70beea4fef9bd7080210;p=android-x86%2Fexternal-mesa.git

configure.ac: strip out the llvm-config -march/mtune flags

Otherwise drivers such as SWR that depend on providing their own values
will fail to build.

v2: Add -mcpu for good measure (Chuck)

Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Cc: Tim Rowley <timothy.o.rowley@intel.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Chuck Atkins <chuck.atkins@kitware.com>
Tested-by: Chuck Atkins <chuck.atkins@kitware.com>
(cherry picked from commit bab5ab69402594637359289c1b5ec6491e91d252)
---

diff --git a/configure.ac b/configure.ac
index 33d1fefc543..c492e158f76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2102,6 +2102,9 @@ AC_ARG_WITH([llvm-prefix],
 strip_unwanted_llvm_flags() {
     # Use \> (marks the end of the word)
     echo `$1` | sed \
+	-e 's/-march=\S*//g' \
+	-e 's/-mtune=\S*//g' \
+	-e 's/-mcpu=\S*//g' \
 	-e 's/-DNDEBUG\>//g' \
 	-e 's/-D_GNU_SOURCE\>//g' \
 	-e 's/-pedantic\>//g' \