[commit: ghc] master: Fix issues with finding llvm tools again (#7661). (c043732)

David Terei davidterei at gmail.com
Thu Feb 14 16:01:34 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c043732145c274476f904d9b4387740b2a47b401

>---------------------------------------------------------------

commit c043732145c274476f904d9b4387740b2a47b401
Author: David Terei <davidterei at gmail.com>
Date:   Thu Feb 14 15:58:58 2013 +0100

    Fix issues with finding llvm tools again (#7661).
    
    Patch modified from one by Karel Gardas <karel.gardas at centrum.cz>.

>---------------------------------------------------------------

 aclocal.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 942d6bb..f09adb7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1981,9 +1981,9 @@ AC_DEFUN([XCODE_VERSION],[
 #
 AC_DEFUN([FIND_LLVM_PROG],[
     FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([$1], [$2], [$3])
-    if test "$1" == ""; then
+    if test "$$1" == ""; then
         GOOD_PATH=`echo $PATH | tr ':,;' '   '`
-        $1=`${FindCmd} ${GOOD_PATH} -type f -perm +111 -maxdepth 1 -regex '.*/$3-[[0-9]]\.[[0-9]]' | ${SortCmd} -n | tail -1`
+        $1=`${FindCmd} ${GOOD_PATH} -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
 ])
 





More information about the ghc-commits mailing list