diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-02-13 02:25:26 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-02-13 02:25:26 +0100 |
| commit | a7e610c37d002bf170231ba2619e08562cd5a29e (patch) | |
| tree | bb88621c5bcbf940374ea895636bfe40861a5dbe | |
| parent | 4d494a39e710fdcb749083593cef4c1504407f5c (diff) | |
| download | pacman-a7e610c37d002bf170231ba2619e08562cd5a29e.tar.gz pacman-a7e610c37d002bf170231ba2619e08562cd5a29e.tar.xz | |
Changed "MARCHFLAG" to "ARCHSWITCH" as the name was confusing (it's not a FLAG
and not always MARCH). Also changes makepkg.conf.in to not have commented -mcpu
lines (due to the above), but to have a comment about the differences in -march
and -mcpu
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | etc/makepkg.conf.in | 9 |
2 files changed, 17 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index d3ea3e7c..0bce1b6e 100644 --- a/configure.ac +++ b/configure.ac @@ -63,51 +63,51 @@ dnl Check for architecture case "$host" in i686-*) AC_DEFINE_UNQUOTED([CARCH], ["i686"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i686"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="i686" CARCHFLAGS="i686" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="x86_64" CARCHFLAGS="x86-64" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="ia64" CARCHFLAGS="ia64" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["mcpu"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="sparc" CARCHFLAGS="v9" - MARCHFLAG="mcpu" + ARCHSWITCH="mcpu" CHOST="${host}" ;; ppc-* | powerpc-*) AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["750"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["mcpu"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="ppc" CARCHFLAGS="750" - MARCHFLAG="mcpu" + ARCHSWITCH="mcpu" CHOST="${host}" ;; i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="i386" CARCHFLAGS="i386" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; *) @@ -117,7 +117,7 @@ esac AC_SUBST(CARCH) AC_SUBST(CARCHFLAGS) -AC_SUBST(MARCHFLAG) +AC_SUBST(ARCHSWITCH) AC_SUBST(CHOST) dnl Help line for config file diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index b5425b26..e9043ed3 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -19,11 +19,10 @@ CARCH="@CARCH@" CHOST="@CHOST@" #-- Exclusive: will only run on @CARCHFLAGS@ -CFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" -CXXFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" -#-- Optimized: will run on any x86, but optimized for i686 -#CFLAGS="-mcpu=i686 -O2 -pipe" -#CXXFLAGS="-mcpu=i686 -O2 -pipe" +# -mtune builds exclusively for an architecture +# -mcpu optimizes for an architecture, but builds for the whole processor family +CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" +CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" |