summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-10 22:14:41 -0500
committerDan McGee <dan@archlinux.org>2011-08-11 11:18:39 -0500
commitf0803f6ece49e760c2992895e35517fd1cf141c9 (patch)
tree1488e6e6479c290174ea2658c18462ae77a74d53
parentedd9ed6a3bbe0a351fdf09b3d4b33c8d2fd66899 (diff)
downloadpacman-f0803f6ece49e760c2992895e35517fd1cf141c9.tar.xz
build: remove mucking with CARCHFLAGS
We've never received an update to this, and gcc has sane defaults out of the box anyway, as do most projects in their build systems. Remove the magic here and just let downstream distros handle any changes or additions necessary, as we already do for LDFLAGS. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--configure.ac11
-rw-r--r--etc/Makefile.am1
-rw-r--r--etc/makepkg.conf.in8
3 files changed, 3 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 6ad5be50..9f5b1cbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,47 +243,37 @@ AC_SUBST(STRIP_SHARED)
AC_SUBST(STRIP_STATIC)
# Check for architecture, used in default makepkg.conf
-# (Note single space left after CARCHFLAGS)
case "${host}" in
i686-*)
CARCH="i686"
- CARCHFLAGS="-march=i686 "
;;
x86_64-*)
CARCH="x86_64"
- CARCHFLAGS="-march=x86-64 "
;;
ia64-*)
CARCH="ia64"
- CARCHFLAGS="-march=ia64 "
;;
sparc-*)
CARCH="sparc"
- CARCHFLAGS="-mcpu=v9 "
;;
ppc-* | powerpc-*)
CARCH="ppc"
- CARCHFLAGS="-mcpu=750 "
;;
i386-*)
CARCH="i386"
- CARCHFLAGS="-march=i386 "
;;
arm-*)
CARCH="arm"
- CARCHFLAGS="-march=armv4 "
;;
*)
AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]])
CARCH="unknown"
- CARCHFLAGS=""
;;
esac
# Now do some things common to all architectures
CHOST="${host}"
AC_SUBST(CARCH)
-AC_SUBST(CARCHFLAGS)
AC_SUBST(CHOST)
# Check for documentation support and status
@@ -407,7 +397,6 @@ ${PACKAGE_NAME}:
linker flags : ${LDFLAGS}
Architecture : ${CARCH}
- Architecture flags : ${CARCHFLAGS}
Host Type : ${CHOST}
Filesize command : ${SIZECMD}
In-place sed command : ${SEDINPLACE}
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 25f18342..67c0e983 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -19,7 +19,6 @@ edit = sed \
-e 's|@CARCH[@]|$(CARCH)|g' \
-e 's|@CHOST[@]|$(CHOST)|g' \
-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
- -e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g' \
-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
$(dist_sysconf_DATA): Makefile
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 778c5304..65d8ab9e 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -26,11 +26,9 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
CARCH="@CARCH@"
CHOST="@CHOST@"
-#-- Exclusive: will only run on @CARCH@
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+#-- Compiler and Linker Flags
+#CFLAGS="-O2 -pipe"
+#CXXFLAGS="-O2 -pipe"
#LDFLAGS=""
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"