From 8936655a35f25bd7c673b7e7402bec77e8c2d44e Mon Sep 17 00:00:00 2001 From: "James E. Housley" Date: Thu, 20 Nov 2003 01:23:54 +0000 Subject: On kris@ suggestion use _CPUCFLAGS to get -mtune also. And I had forgotten CXXFLAGS --- devel/i386-rtems-g77/Makefile | 3 ++- devel/i386-rtems-gcc/Makefile | 3 ++- devel/i386-rtems-objc/Makefile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'devel') diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile index 5b29ef4d31c1..02aeeffff677 100644 --- a/devel/i386-rtems-g77/Makefile +++ b/devel/i386-rtems-g77/Makefile @@ -62,7 +62,8 @@ 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=[^ ]*//} +CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} +CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//} pre-configure: @(cd ${WRKDIR} ; \ diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile index dcf726c154ff..5bdeda73c49b 100644 --- a/devel/i386-rtems-gcc/Makefile +++ b/devel/i386-rtems-gcc/Makefile @@ -67,7 +67,8 @@ 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=[^ ]*//} +CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} +CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//} 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 80fde57873fc..abf8b77adde2 100644 --- a/devel/i386-rtems-objc/Makefile +++ b/devel/i386-rtems-objc/Makefile @@ -62,7 +62,8 @@ 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=[^ ]*//} +CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} +CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//} pre-configure: @(cd ${WRKDIR} ; \ -- cgit v1.2.3