From 2c9e95550730ac8c456c12eace4b8237b50d3af0 Mon Sep 17 00:00:00 2001 From: jeh Date: Wed, 21 Jan 2004 11:27:15 +0000 Subject: Remove my hack to remove CPU_CFLAGS and use the new WITHOUT_CPU_CFLAGS feature in bsd.port.mk --- devel/i386-rtems-g77/Makefile | 11 +++-------- devel/i386-rtems-gcc/Makefile | 11 +++-------- devel/i386-rtems-objc/Makefile | 11 +++-------- 3 files changed, 9 insertions(+), 24 deletions(-) (limited to 'devel') diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile index 74c9592..fca1824 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 32ac2e2..ef8d076 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 7362a7c..ef06826 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} ; \ -- cgit v1.1