summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)