From 3acbf56bbab128d8ef037a7dcc87d91fe7354d14 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 20 Aug 2007 00:38:37 -0400 Subject: Clean up architecture handling in configure.ac Remove the need for two variables for the architecture-specific switches (things like "-march=i686") by combining it into one variable. Also allow configure to proceed with only a warning if we don't have presets for the detected architecture- it is kind of stupid to restrict ourselves like we had been. Signed-off-by: Dan McGee --- configure.ac | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7c93a9f1..011ce300 100644 --- a/configure.ac +++ b/configure.ac @@ -181,45 +181,41 @@ case "${host}" in ;; esac -# Check for architecture +# Check for architecture, used in default makepkg.conf +# (Note single space left after CARCHFLAGS) case "${host}" in i686-*) CARCH="i686" - CARCHFLAGS="i686" - ARCHSWITCH="march" + CARCHFLAGS="-march=i686 " ;; x86_64-*) CARCH="x86_64" - CARCHFLAGS="x86-64" - ARCHSWITCH="march" + CARCHFLAGS="-march=x86-64 " ;; ia64-*) CARCH="ia64" - CARCHFLAGS="ia64" - ARCHSWITCH="march" + CARCHFLAGS="-march=ia64 " ;; sparc-*) CARCH="sparc" - CARCHFLAGS="v9" - ARCHSWITCH="mcpu" + CARCHFLAGS="-mcpu=v9 " ;; ppc-* | powerpc-*) CARCH="ppc" - CARCHFLAGS="750" - ARCHSWITCH="mcpu" + CARCHFLAGS="-mcpu=750 " ;; i386-*) CARCH="i386" - CARCHFLAGS="i386" - ARCHSWITCH="march" + CARCHFLAGS="-march=i386 " ;; arm-*) CARCH="arm" - CARCHFLAGS="armv4" - ARCHSWITCH="march" + CARCHFLAGS="-march=armv4 " ;; *) - AC_MSG_ERROR([[Your architecture is not supported; consider adding it to configure.ac]]) + AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]]) + CARCH="unknown" + CARCHFLAGS="" ;; esac @@ -227,7 +223,6 @@ esac CHOST="${host}" AC_SUBST(CARCH) AC_SUBST(CARCHFLAGS) -AC_SUBST(ARCHSWITCH) AC_SUBST(CHOST) # Check for doxygen support @@ -315,7 +310,7 @@ $PACKAGE_STRING: defines : ${DEFS} Architecture : ${CARCH} - Architecture flags : -${ARCHSWITCH}=${CARCHFLAGS} + Architecture flags : ${CARCHFLAGS} Host Type : ${CHOST} libalpm version : ${LIB_VERSION} -- cgit v1.2.3-24-g4f1b