@@ -18497,8 +18497,17 @@ $as_echo_n "checking pcre-config version... " >&6; }

     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcre_version" >&5

 $as_echo "$pcre_version" >&6; }

-    pcrever_major=`echo "$pcre_version" | sed -re 's/([0-9]+).*/\1/'`

-    pcrever_minor=`echo "$pcre_version" | sed -re 's/[0-9]+\.([0-9]+).*/\1/'`

+

+    case $host_os in

+      darwin* )

+        pcrever_major=`echo "$pcre_version" | sed -Ee 's/([0-9]+).*/\1/'`

+        pcrever_minor=`echo "$pcre_version" | sed -Ee 's/[0-9]+\.([0-9]+).*/\1/'`

+        ;;

+      *)

+        pcrever_major=`echo "$pcre_version" | sed -re 's/([0-9]+).*/\1/'`

+        pcrever_minor=`echo "$pcre_version" | sed -re 's/[0-9]+\.([0-9]+).*/\1/'`

+        ;;

+    esac

         if test "$pcrelib" = "pcre"; then

         if test $pcrever_major -lt 6; then

@@ -5750,8 +5750,8 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 clean: clean-am

 clean-am: clean-generic clean-libtool clean-local \

@@ -16553,10 +16553,21 @@ else

 fi

 llvmver_val=`echo "$llvmver" | sed -e 's/svn//g'`

-llvmver_sval=`echo "$llvmver_val" | sed -re 's/[0-9]+//' | sed -e 's/^\.//'`

-llvmver_major=`echo "$llvmver_val"  | sed -re 's/([0-9]+).*/\1/'`

-llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([0-9]+).*/\1/'`

-llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[0-9]+//' | sed -e 's/^\.//' | sed -re 's/([0-9]+).*/\1/'`

+

+case $host_os in

+  darwin* )

+    llvmver_sval=`echo "$llvmver_val" | sed -Ee 's/[0-9]+//' | sed -e 's/^\.//'`

+    llvmver_major=`echo "$llvmver_val"  | sed -Ee 's/([0-9]+).*/\1/'`

+    llvmver_minor=`echo "$llvmver_sval" | sed -Ee 's/([0-9]+).*/\1/'`

+    llvmver_patch=`echo "$llvmver_sval" | sed -Ee 's/[0-9]+//' | sed -e 's/^\.//' | sed -Ee 's/([0-9]+).*/\1/'`

+    ;;

+  *)

+    llvmver_sval=`echo "$llvmver_val" | sed -re 's/[0-9]+//' | sed -e 's/^\.//'`

+    llvmver_major=`echo "$llvmver_val"  | sed -re 's/([0-9]+).*/\1/'`

+    llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([0-9]+).*/\1/'`

+    llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[0-9]+//' | sed -e 's/^\.//' | sed -re 's/([0-9]+).*/\1/'`

+    ;;

+esac

 llvmver_suffix=

 if test "x$llvmver_patch" = "x"; then

     llvmver_patch=0