From f0803f6ece49e760c2992895e35517fd1cf141c9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 10 Aug 2011 22:14:41 -0500 Subject: 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 --- etc/Makefile.am | 1 - etc/makepkg.conf.in | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'etc') 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" -- cgit v1.2.3-24-g4f1b