From: Vinson Lee <vlee@freedesktop.org>
Date: Thu, 16 Mar 2017 22:26:18 +0000 (-0700)
Subject: configure.ac: Use POSIX compatible regex for word boundary.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62c48ccb413bbb0d3d305966514b7783640eaf89;p=mesa.git

configure.ac: Use POSIX compatible regex for word boundary.

Fixes build error on Mac OS X.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100236
Suggested-by: Jan Beich <jbeich@freebsd.org>
Suggested-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/configure.ac b/configure.ac
index 8c9d756f294..dbf0bf83185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -907,19 +907,19 @@ llvm_add_target() {
 # Call this inside ` ` to get the return value.
 # $1 is the llvm-config command with arguments.
 strip_unwanted_llvm_flags() {
-    # Use \> (marks the end of the word)
-    echo " `$1`" | sed -E \
+    echo " `$1` " | sed -E \
         -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
-        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
-        -e 's/[[[:space:]]]+-pedantic\>//g' \
+        -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]//g' \
+        -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]//g' \
+        -e 's/[[[:space:]]]+-pedantic[[[:space:]]]//g' \
         -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
         -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
         -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-        -e 's/-fno-rtti\>/-Fno-rtti/g' \
+        -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
         -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-        -e 's/-Fno-rtti\>/-fno-rtti/g' \
-        -e 's/^[[[:space:]]]//'
+        -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
+        -e 's/^[[[:space:]]]//' \
+        -e 's/[[[:space:]]]$//'
 }
 
 llvm_set_environment_variables() {