aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2008-01-06 19:46:38 +0200
committerLasse Collin <lasse.collin@tukaani.org>2008-01-06 19:46:38 +0200
commit88ee301ec2e4506a30ec7ac9aaa2288e2dcadd0e (patch)
treef4bfffaae44ab4c76f4615fafb9da348d2a77ce5
parentWith printf(), use PRIu64 with a cast to uint64_t instead (diff)
downloadxz-88ee301ec2e4506a30ec7ac9aaa2288e2dcadd0e.tar.xz
Automatically disable assembler code on Darwin x86.
Darwin has different ABI than GNU+Linux and Solaris, thus the assembler code doesn't assemble on Darwin.
-rw-r--r--configure.ac17
1 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 514408e8..da2944cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,8 +298,21 @@ AC_ARG_ENABLE(assembler, AC_HELP_STRING([--disable-assembler],
[], [enable_assembler=yes])
if test "x$enable_assembler" = xyes; then
case $host_cpu in
- i?86) enable_assembler=x86 ;;
- *) enable_assembler=no ;;
+ i?86)
+ # Darwin has different ABI than GNU+Linux and Solaris,
+ # and the x86 assembler code doesn't assemble.
+ case $host_os in
+ darwin*)
+ enable_assembler=no
+ ;;
+ *)
+ enable_assembler=x86
+ ;;
+ esac
+ ;;
+ *)
+ enable_assembler=no
+ ;;
esac
fi
case $enable_assembler in