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>
This commit is contained in:
parent
f0803f6ece
commit
ca41470462
32
configure.ac
32
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)
|
||||
|
|
Loading…
Reference in New Issue