Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=805078a42183bcd8ac719c63519ee9753ce80b71
commit 805078a42183bcd8ac719c63519ee9753ce80b71 Author: James Buren <[email protected]> Date: Mon Mar 19 05:19:51 2012 -0500 makepkg.conf.in: rely on uname for arch specific variables this enables x86_64 to use fw32 for compiling i686 packages diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 5f0f0f4..3ffbdfd 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -10,15 +10,28 @@ export FTPAGENT="/usr/bin/wget -U makepkg --continue --passive-ftp --tries=3 --w # The rsync utility that makepkg should use to access the Frugalware mirrors export RSYNCAGENT="rsync -e 'ssh -q -o GlobalKnownHostsFile=$HOME/.ssh/known_hosts -i $HOME/.ssh/id_dsa' -vP" -export CARCH="@CARCH@" -export CHOST="@CHOST@" - -# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries -# will use the P6 instruction set and only run on P6+ systems) -# As of GCC 4.2 -mtune=generic can be used to generate code running well on -# common x86 chips. -export CFLAGS="@CARCHFLAGS@ -O2 -pipe" -export CXXFLAGS="@CARCHFLAGS@ -O2 -pipe" +case $(uname -m) in + i686) + CARCH="i686" + CHOST="i686-frugalware-linux" + CFLAGS="-march=i686 -mtune=generic -O2 -pipe" + CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe" + ;; + x86_64) + CARCH="x86_64" + CHOST="x86_64-frugalware-linux" + CFLAGS="-march=x86_64 -mtune=generic -O2 -pipe" + CXXFLAGS="-march=x86_64 -mtune=generic -O2 -pipe" + ;; + arm*) + CARCH="arm" + CHOST="arm-frugalware-linux" + CFLAGS="-march=armv5te -O2 -pipe" + CXXFLAGS="-march=armv5te -O2 -pipe" + ;; +esac + +export CARCH CHOST CFLAGS CXXFLAGS # SMP Systems #export MAKEFLAGS="-j2" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
