diff options
| -rw-r--r-- | aclocal.m4 | 20 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | docs/users_guide/flags.xml | 2 |
3 files changed, 18 insertions, 8 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 73b8890075..a4944c1357 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2095,21 +2095,31 @@ AC_DEFUN([XCODE_VERSION],[ AC_DEFUN([FIND_LLVM_PROG],[ FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL_NOTARGET([$1], [$2], [$3]) if test "$$1" = ""; then + echo -n "checking for $3-x.x... " save_IFS=$IFS IFS=":;" + if test "$windows" = YES; then + PERM= + MODE= + else + # Search for executables. + PERM="-perm" + MODE="/+x" + fi for p in ${PATH}; do if test -d "${p}"; then - 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 + $1=`${FindCmd} "${p}" -maxdepth 1 \( -type f -o -type l \) ${PERM} ${MODE} -regex ".*/$3-[[0-9]]\.[[0-9]]" | ${SortCmd} -n | tail -1` if test -n "$$1"; then break fi fi done IFS=$save_IFS + if test -n "$$1"; then + echo "$$1" + else + echo "no" + fi fi ]) diff --git a/configure.ac b/configure.ac index f65d133aa7..c64af90b62 100644 --- a/configure.ac +++ b/configure.ac @@ -508,7 +508,7 @@ then echo "main = putStrLn \"%function\"" > conftestghc.hs # Check whether LLVM backend is default for this platform - "${WithGhc}" conftestghc.hs 2>&1 >/dev/null + "${WithGhc}" -pgmlc="${LlcCmd}" -pgmlo="${OptCmd}" conftestghc.hs 2>&1 >/dev/null res=`./conftestghc` if test "x$res" = "x%object" then @@ -525,7 +525,7 @@ then # -fllvm is not the default, but set a flag so the Makefile can check # -for it in the build flags later on - "${WithGhc}" -fforce-recomp -fllvm conftestghc.hs 2>&1 >/dev/null + "${WithGhc}" -fforce-recomp -pgmlc="${LlcCmd}" -pgmlo="${OptCmd}" -fllvm conftestghc.hs 2>&1 >/dev/null if test $? = 0 then res=`./conftestghc` diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml index 3d90479adf..4bf78b6fc0 100644 --- a/docs/users_guide/flags.xml +++ b/docs/users_guide/flags.xml @@ -2731,6 +2731,7 @@ <entry>Use <replaceable>cmd</replaceable> as the C compiler</entry> <entry>dynamic</entry> <entry>-</entry> + </row> <row> <entry><option>-pgmlo</option> <replaceable>cmd</replaceable></entry> <entry>Use <replaceable>cmd</replaceable> as the LLVM optimiser</entry> @@ -2743,7 +2744,6 @@ <entry>dynamic</entry> <entry>-</entry> </row> - </row> <row> <entry><option>-pgms</option> <replaceable>cmd</replaceable></entry> <entry>Use <replaceable>cmd</replaceable> as the splitter</entry> |