mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-27 05:10:36 +00:00
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.
This commit is contained in:
parent
f23ad694cc
commit
1464e9906b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=98791
@ -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} ; \
|
||||
|
@ -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 \
|
||||
|
@ -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} ; \
|
||||
|
Loading…
Reference in New Issue
Block a user