From 1464e9906bf82f06cca041f9d9908706774932ff Mon Sep 17 00:00:00 2001 From: "James E. Housley" Date: Thu, 22 Jan 2004 12:12:48 +0000 Subject: Revert back to previous method to remove the CPU related entries from CFLAGS. At least on 4.9, the new changes to bsd.port.mk don't like if _CPUCFLAGS is empty. --- devel/i386-rtems-gcc/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'devel/i386-rtems-gcc') 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 \ -- cgit v1.2.3