[commit: ghc] ghc-7.8: Set llc and opt commands on all platforms (3e55077)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e550770dff6a2852ecdbe755a63b29b3efa8dd1/ghc

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

commit 3e550770dff6a2852ecdbe755a63b29b3efa8dd1
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon Sep 1 15:14:07 2014 -0500

    Set llc and opt commands on all platforms
    
    Summary:
    LLVM llc and opt commands should be set on all platforms, including
    Windows. If they're not, GHC tries to execute an unnamed executable,
    resulting in error messages such as:
    
        Error (figuring out LLVM version): : runInteractiveProcess: invalid argument (Invalid argument)
        <no location info>:
            Warning: Couldn't figure out LLVM version!
                     Make sure you have installed LLVM
    
    This regression was introduced in e6bfc596.
    
    Test Plan: Build GHC and test if --info shows sensible values of "LLVM llc command" and "LLVM opt command"
    
    Reviewers: austin, #ghc
    
    Reviewed By: austin, #ghc
    
    Subscribers: austin
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D190
    
    GHC Trac Issues: #7143
    
    (cherry picked from commit 918719b936b878ab660f20ceef8afc9e3a898c5a)


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

3e550770dff6a2852ecdbe755a63b29b3efa8dd1
 aclocal.m4 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 7224cd5..4916212 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -470,18 +470,18 @@ AC_DEFUN([FP_SETTINGS],
         SettingsWindresCommand="/bin/false"
         SettingsLibtoolCommand="libtool"
         SettingsTouchCommand='touch'
-        if test -z "$LlcCmd"
-        then
-          SettingsLlcCommand="llc"
-        else
-          SettingsLlcCommand="$LlcCmd"
-        fi
-        if test -z "$OptCmd"
-        then
-          SettingsOptCommand="opt"
-        else
-          SettingsOptCommand="$OptCmd"
-        fi
+    fi
+    if test -z "$LlcCmd"
+    then
+      SettingsLlcCommand="llc"
+    else
+      SettingsLlcCommand="$LlcCmd"
+    fi
+    if test -z "$OptCmd"
+    then
+      SettingsOptCommand="opt"
+    else
+      SettingsOptCommand="$OptCmd"
     fi
     SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2"
     SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2"