Mesa (master): configure.ac: Use POSIX compatible regex for word boundary.
Vinson Lee
vlee at kemper.freedesktop.org
Wed Mar 22 07:06:05 UTC 2017
Module: Mesa
Branch: master
Commit: 62c48ccb413bbb0d3d305966514b7783640eaf89
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=62c48ccb413bbb0d3d305966514b7783640eaf89
Author: Vinson Lee <vlee at freedesktop.org>
Date: Thu Mar 16 15:26:18 2017 -0700
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 at freebsd.org>
Suggested-by: Michel Dänzer <michel at daenzer.net>
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Acked-by: Emil Velikov <emil.velikov at collabora.com>
---
configure.ac | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8c9d756f29..dbf0bf8318 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() {
More information about the mesa-commit
mailing list