diff options
| author | Dan McGee <dan@archlinux.org> | 2007-08-20 00:38:37 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-08-20 00:38:37 -0400 |
| commit | 3acbf56bbab128d8ef037a7dcc87d91fe7354d14 (patch) | |
| tree | 701257c6f71aa602e35c79b0785db7eaf238197c | |
| parent | f81e619974ca47f6dba8c3002577447a71e0f1ec (diff) | |
| download | pacman-3acbf56bbab128d8ef037a7dcc87d91fe7354d14.tar.xz | |
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 <dan@archlinux.org>
| -rw-r--r-- | configure.ac | 31 | ||||
| -rw-r--r-- | etc/makepkg.conf.in | 4 |
2 files changed, 15 insertions, 20 deletions
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} diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 437aab0c..d13c3d69 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -29,8 +29,8 @@ CHOST="@CHOST@" #-- Exclusive: will only run on @CARCHFLAGS@ # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe" -CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe" +CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" |