summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorKarel Gardas <karel.gardas@centrumcz>2011-11-02 10:29:39 -0700
committerDavid Terei <davidterei@gmail.com>2011-11-02 10:29:39 -0700
commit2bc8a7b70fd226face652ecca6a3e9877abc3917 (patch)
treea9371cf6b143b92c2d9a067169fe014d488bf93c /aclocal.m4
parent515728a3d374751bfb02e5b4bbd383e3f99eb630 (diff)
downloadhaskell-2bc8a7b70fd226face652ecca6a3e9877abc3917.tar.gz
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 <davidterei@gmail.com>
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 7d0bf8681c..f76c082388 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
])
])