aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorjeh <jeh@FreeBSD.org>2004-01-21 19:27:15 +0800
committerjeh <jeh@FreeBSD.org>2004-01-21 19:27:15 +0800
commit2c9e95550730ac8c456c12eace4b8237b50d3af0 (patch)
treef3de6acfe0bad68fefcdf6ba2c67c4dbb36308ad /devel
parent0547874bac3964b96f533ebfdd155939f28b2c9e (diff)
downloadfreebsd-ports-gnome-2c9e95550730ac8c456c12eace4b8237b50d3af0.tar.gz
freebsd-ports-gnome-2c9e95550730ac8c456c12eace4b8237b50d3af0.tar.zst
freebsd-ports-gnome-2c9e95550730ac8c456c12eace4b8237b50d3af0.zip
Remove my hack to remove CPU_CFLAGS and use the new WITHOUT_CPU_CFLAGS
feature in bsd.port.mk
Diffstat (limited to 'devel')
-rw-r--r--devel/i386-rtems-g77/Makefile11
-rw-r--r--devel/i386-rtems-gcc/Makefile11
-rw-r--r--devel/i386-rtems-objc/Makefile11
3 files changed, 9 insertions, 24 deletions
diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile
index 74c9592d2541..fca18246231f 100644
--- a/devel/i386-rtems-g77/Makefile
+++ b/devel/i386-rtems-g77/Makefile
@@ -56,14 +56,9 @@ CONFIGURE_SCRIPT?= ../${G77NAME}/configure
PATCH_WRKSRC= ${WRKDIR}
PATCH_STRIP= -p
-NO_CPU_FLAGS= true
-MAKE_FLAGS= LANGUAGES="f77"
-MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true
-# Since once mk/bsd.cpu.mk adds the _CPUCFLAGS they can't be removed
-# by NO_CPU_FLAGS, and since they are added long before here we are
-# stuck with this hack.
-CFLAGS:= ${CFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
-CXXFLAGS:= ${CXXFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
+WITHOUT_CPU_CFLAGS= true
+MAKE_FLAGS= LANGUAGES="f77"
+MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH}
pre-configure:
@(cd ${WRKDIR} ; \
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index 32ac2e289eec..ef8d0766a9ba 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -61,14 +61,9 @@ CONFIGURE_SCRIPT?= ../${GCCNAME}/configure
PATCH_WRKSRC= ${WRKDIR}
PATCH_STRIP= -p
-NO_CPU_FLAGS= true
-MAKE_FLAGS= LANGUAGES="c c++ java"
-MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true
-# Since once mk/bsd.cpu.mk adds the _CPUCFLAGS they can't be removed
-# by NO_CPU_FLAGS, and since they are added long before here we are
-# stuck with this hack.
-CFLAGS:= ${CFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
-CXXFLAGS:= ${CXXFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
+WITHOUT_CPU_CFLAGS= true
+MAKE_FLAGS= LANGUAGES="c c++ java"
+MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH}
MAN1= ${LCLTARGET}-gcc.1 ${LCLTARGET}-g++.1 ${LCLTARGET}-gcj.1 \
cpp.1 gcov.1 gcjh.1 jv-scan.1 jcf-dump.1 gij.1 \
diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile
index 7362a7cd0abe..ef068265da54 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -56,14 +56,9 @@ CONFIGURE_SCRIPT?= ../${OBJCNAME}/configure
PATCH_WRKSRC= ${WRKDIR}
PATCH_STRIP= -p
-NO_CPU_FLAGS= true
-MAKE_FLAGS= LANGUAGES="objc"
-MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true
-# Since once mk/bsd.cpu.mk adds the _CPUCFLAGS they can't be removed
-# by NO_CPU_FLAGS, and since they are added long before here we are
-# stuck with this hack.
-CFLAGS:= ${CFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
-CXXFLAGS:= ${CXXFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
+WITHOUT_CPU_CFLAGS= true
+MAKE_FLAGS= LANGUAGES="objc"
+MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH}
pre-configure:
@(cd ${WRKDIR} ; \