summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-10 22:40:30 -0500
committerDan McGee <dan@archlinux.org>2011-08-11 11:18:48 -0500
commitca41470462c3a674966e55be7186c5bdefbe6242 (patch)
tree18747a4e7eec07b6e50ef0ae794f1ce964807058
parentf0803f6ece49e760c2992895e35517fd1cf141c9 (diff)
downloadpacman-ca41470462c3a674966e55be7186c5bdefbe6242.tar.xz
configure: simplify CARCH generation madness
Rather than a hardcoded list of only a few select architectures (of the 250+ case statements in config.guess), simply define CARCH to be the first component of the "target triplet". This introduces one "regression"- powerpc will no longer become ppc. However, this is easily worked around in downstream distros if wanted. This was the only CPU architecture with this oddity so it was felt worth the price to make this change. Note that 'ppc64' wasn't handled in this same odd fashion before anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--configure.ac32
1 files changed, 2 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac
index 9f5b1cbd..309a591a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,36 +242,8 @@ AC_SUBST(STRIP_BINARIES)
AC_SUBST(STRIP_SHARED)
AC_SUBST(STRIP_STATIC)
-# Check for architecture, used in default makepkg.conf
-case "${host}" in
- i686-*)
- CARCH="i686"
- ;;
- x86_64-*)
- CARCH="x86_64"
- ;;
- ia64-*)
- CARCH="ia64"
- ;;
- sparc-*)
- CARCH="sparc"
- ;;
- ppc-* | powerpc-*)
- CARCH="ppc"
- ;;
- i386-*)
- CARCH="i386"
- ;;
- arm-*)
- CARCH="arm"
- ;;
- *)
- AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]])
- CARCH="unknown"
- ;;
-esac
-
-# Now do some things common to all architectures
+# Variables plugged into makepkg.conf
+CARCH="${host%%-*}"
CHOST="${host}"
AC_SUBST(CARCH)
AC_SUBST(CHOST)