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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2bc8a7b70fd226face652ecca6a3e9877abc3917

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

commit 2bc8a7b70fd226face652ecca6a3e9877abc3917
Author: Karel Gardas <karel.gardas@centrumcz>
Date:   Wed Nov 2 10:29:39 2011 -0700

    fix configure's generation of settings file on ARM platform
    
    This patch fixes generation of settings file on ARM platform
    by configure script. This fixes build issue on ARM platform
    where ghc-stage1 compiler is not able to read the target arch
    value and due to this issue build fails with:
    
    ghc-cabal: Failed to read "target arch" value "ArchARM ARMv7 [VFPv3, NEON]"
    
    Signed-off-by: David Terei <[email protected]>

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

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

diff --git a/aclocal.m4 b/aclocal.m4
index 7d0bf86..f76c082 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -172,7 +172,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
             ;;
         arm)
             GET_ARM_ISA()
-            test -z "[$]2" || eval "[$]2=\"ArchARM \$ARM_ISA \$ARM_ISA_EXT\""
+            test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, 
armISAExt = \$ARM_ISA_EXT}\""
             ;;
         alpha)
             test -z "[$]2" || eval "[$]2=ArchAlpha"
@@ -336,7 +336,7 @@ AC_DEFUN([GET_ARM_ISA],
                 ],
                 [changequote(, )dnl
                  ARM_ISA=ARMv7
-                 ARM_ISA_EXT="[VFPv3, NEON]"
+                 ARM_ISA_EXT="[VFPv3,NEON]"
                  changequote([, ])dnl
                 ])
         ])



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to