diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile
index fca18246231f..74c9592d2541 100644
--- a/devel/i386-rtems-g77/Makefile
+++ b/devel/i386-rtems-g77/Makefile
@@ -56,9 +56,14 @@ CONFIGURE_SCRIPT?=	../${G77NAME}/configure
 PATCH_WRKSRC=		${WRKDIR}
 PATCH_STRIP=		-p
 
-WITHOUT_CPU_CFLAGS=	true
-MAKE_FLAGS=		LANGUAGES="f77"
-MAKE_ENV=		MACHINE_ARCH=${RTEMS_ARCH}
+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=[^ ]*//}
 
 pre-configure:
 	@(cd ${WRKDIR} ; \
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index ef8d0766a9ba..32ac2e289eec 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -61,9 +61,14 @@ CONFIGURE_SCRIPT?=	../${GCCNAME}/configure
 PATCH_WRKSRC=		${WRKDIR}
 PATCH_STRIP=		-p
 
-WITHOUT_CPU_CFLAGS=	true
-MAKE_FLAGS=		LANGUAGES="c c++ java"
-MAKE_ENV=		MACHINE_ARCH=${RTEMS_ARCH}
+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=[^ ]*//}
 
 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 ef068265da54..7362a7cd0abe 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -56,9 +56,14 @@ CONFIGURE_SCRIPT?=	../${OBJCNAME}/configure
 PATCH_WRKSRC=		${WRKDIR}
 PATCH_STRIP=		-p
 
-WITHOUT_CPU_CFLAGS=	true
-MAKE_FLAGS=		LANGUAGES="objc"
-MAKE_ENV=		MACHINE_ARCH=${RTEMS_ARCH}
+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=[^ ]*//}
 
 pre-configure:
 	@(cd ${WRKDIR} ; \