aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorjeh <jeh@FreeBSD.org>2003-11-20 09:36:40 +0800
committerjeh <jeh@FreeBSD.org>2003-11-20 09:36:40 +0800
commit0294db10b92ddb5bc33d820323c281cb669db777 (patch)
treee01ff1801bc897817580cd1e6ca55344e602ac4a /devel
parente85d46bdca1fcc397196ddcbfbb10f77e9c9210a (diff)
downloadfreebsd-ports-gnome-0294db10b92ddb5bc33d820323c281cb669db777.tar.gz
freebsd-ports-gnome-0294db10b92ddb5bc33d820323c281cb669db777.tar.zst
freebsd-ports-gnome-0294db10b92ddb5bc33d820323c281cb669db777.zip
I was getting a recursive error on CFLAGS I didn't get on 5.x
Diffstat (limited to 'devel')
-rw-r--r--devel/i386-rtems-g77/Makefile4
-rw-r--r--devel/i386-rtems-gcc/Makefile4
-rw-r--r--devel/i386-rtems-objc/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile
index 02aeeffff677..663abfcb19b5 100644
--- a/devel/i386-rtems-g77/Makefile
+++ b/devel/i386-rtems-g77/Makefile
@@ -62,8 +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/${_CPUCFLAGS}//}
-CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//}
+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 5bdeda73c49b..32ac2e289eec 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -67,8 +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/${_CPUCFLAGS}//}
-CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//}
+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 abf8b77adde2..2b19b68fe6d5 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -62,8 +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/${_CPUCFLAGS}//}
-CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//}
+CFLAGS:= ${CFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
+CXXFLAGS:= ${CXXFLAGS:C/-mcpu=[^ ]*//:C/-march=[^ ]*//:C/-mtune=[^ ]*//}
pre-configure:
@(cd ${WRKDIR} ; \