From 0f2f62d79dd94169db5df9cd6ec4b9bf359d31f8 Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Thu, 14 Nov 2013 18:31:30 +0000 Subject: [PATCH] Fix regular expression to work with multiple-digit version numbers git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194719 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index e53598b..2458bd8 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -550,9 +550,9 @@ ifeq ($(HOST_OS),Darwin) DARWIN_VERSION := `sw_vers -productVersion` endif # Strip a number like 10.4.7 to 10.4 - DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/') + DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]+).*/\1/') # Get "4" out of 10.4 for later pieces in the makefile. - DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/') + DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]+).*/\1/') LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress SharedLinkOptions := -dynamiclib --- a/projects/sample/Makefile.llvm.rules.orig 2013-08-04 15:06:11.000000000 -0700 +++ b/projects/sample/Makefile.llvm.rules 2014-08-30 12:34:15.000000000 -0700 @@ -476,9 +476,9 @@ endif ifeq ($(HOST_OS),Darwin) DARWIN_VERSION := `sw_vers -productVersion` # Strip a number like 10.4.7 to 10.4 - DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/') + DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]+).*/\1/') # Get "4" out of 10.4 for later pieces in the makefile. - DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/') + DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]+).*/\1/') LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress SharedLinkOptions := -dynamiclib