... | ... |
@@ -67,10 +67,21 @@ else |
67 | 67 |
fi |
68 | 68 |
|
69 | 69 |
llvmver_val=`echo "$llvmver" | sed -e 's/svn//g'` |
70 |
-llvmver_sval=`echo "$llvmver_val" | sed -re 's/[[0-9]]+//' | sed -e 's/^\.//'` |
|
71 |
-llvmver_major=`echo "$llvmver_val" | sed -re 's/([[0-9]]+).*/\1/'` |
|
72 |
-llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([[0-9]]+).*/\1/'` |
|
73 |
-llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[[0-9]]+//' | sed -e 's/^\.//' | sed -re 's/([[0-9]]+).*/\1/'` |
|
70 |
+AC_CANONICAL_HOST |
|
71 |
+case $host_os in |
|
72 |
+ darwin* ) |
|
73 |
+ llvmver_sval=`echo "$llvmver_val" | sed -Ee 's/[[0-9]]+//' | sed -e 's/^\.//'` |
|
74 |
+ llvmver_major=`echo "$llvmver_val" | sed -Ee 's/([[0-9]]+).*/\1/'` |
|
75 |
+ llvmver_minor=`echo "$llvmver_sval" | sed -Ee 's/([[0-9]]+).*/\1/'` |
|
76 |
+ llvmver_patch=`echo "$llvmver_sval" | sed -Ee 's/[[0-9]]+//' | sed -e 's/^\.//' | sed -Ee 's/([[0-9]]+).*/\1/'` |
|
77 |
+ ;; |
|
78 |
+ *) |
|
79 |
+ llvmver_sval=`echo "$llvmver_val" | sed -re 's/[[0-9]]+//' | sed -e 's/^\.//'` |
|
80 |
+ llvmver_major=`echo "$llvmver_val" | sed -re 's/([[0-9]]+).*/\1/'` |
|
81 |
+ llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([[0-9]]+).*/\1/'` |
|
82 |
+ llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[[0-9]]+//' | sed -e 's/^\.//' | sed -re 's/([[0-9]]+).*/\1/'` |
|
83 |
+ ;; |
|
84 |
+esac |
|
74 | 85 |
dnl suffix unused as of LLVM 3.4.1 |
75 | 86 |
llvmver_suffix= |
76 | 87 |
if test "x$llvmver_patch" = "x"; then |
... | ... |
@@ -54,8 +54,17 @@ if test "x$pcreconfig" != "x"; then |
54 | 54 |
fi |
55 | 55 |
|
56 | 56 |
AC_MSG_RESULT([$pcre_version]) |
57 |
- pcrever_major=`echo "$pcre_version" | sed -re 's/([[0-9]]+).*/\1/'` |
|
58 |
- pcrever_minor=`echo "$pcre_version" | sed -re 's/[[0-9]]+\.([[0-9]]+).*/\1/'` |
|
57 |
+ AC_CANONICAL_HOST |
|
58 |
+ case $host_os in |
|
59 |
+ darwin* ) |
|
60 |
+ pcrever_major=`echo "$pcre_version" | sed -Ee 's/([[0-9]]+).*/\1/'` |
|
61 |
+ pcrever_minor=`echo "$pcre_version" | sed -Ee 's/[[0-9]]+\.([[0-9]]+).*/\1/'` |
|
62 |
+ ;; |
|
63 |
+ *) |
|
64 |
+ pcrever_major=`echo "$pcre_version" | sed -re 's/([[0-9]]+).*/\1/'` |
|
65 |
+ pcrever_minor=`echo "$pcre_version" | sed -re 's/[[0-9]]+\.([[0-9]]+).*/\1/'` |
|
66 |
+ ;; |
|
67 |
+ esac |
|
59 | 68 |
|
60 | 69 |
dnl check for match_limit_recursion support |
61 | 70 |
if test "$pcrelib" = "pcre"; then |