diff options
| author | niklas <niklas@mm.st> | 2014-07-24 23:08:24 +0200 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-07-28 09:29:18 -0500 |
| commit | 003bcf20c20391fdd61789ba24269b0f508a3d2f (patch) | |
| tree | f9af2d7b0f1d5380bfd3eb380ad7808fce0347eb /aclocal.m4 | |
| parent | 9a7440c0dc038a19432e86923ac30ade7bcea3e7 (diff) | |
| download | haskell-003bcf20c20391fdd61789ba24269b0f508a3d2f.tar.gz | |
Do not check permissions when running find on Windows.
Fixes #9363.
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 394e405374..fbd82d9a67 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2069,7 +2069,11 @@ AC_DEFUN([FIND_LLVM_PROG],[ IFS=":;" for p in ${PATH}; do if test -d "${p}"; then - $1=`${FindCmd} "${p}" -type f -perm +111 -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' -or -type l -perm +111 -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' | ${SortCmd} -n | tail -1` + if test "$windows" = YES; then + $1=`${FindCmd} "${p}" -type f -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' -or -type l -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' | ${SortCmd} -n | tail -1` + else + $1=`${FindCmd} "${p}" -type f -perm +111 -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' -or -type l -perm +111 -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' | ${SortCmd} -n | tail -1` + fi if test -n "$$1"; then break fi @@ -2100,7 +2104,7 @@ AC_DEFUN([FIND_GCC],[ $1="$CC" else FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([$1], [$2], [$3]) - # From Xcode 5 on, OS X command line tools do not include gcc + # From Xcode 5 on/, OS X command line tools do not include gcc # anymore. Use clang. if test -z "$$1" then |