svn commit: r487017 - head/devel/psptoolchain-newlib

[Steve Wills]

Author: swills
Date: Sun Dec  9 03:16:52 2018
New Revision: 487017
URL: https://svnweb.freebsd.org/changeset/ports/487017

Log:
  devel/psptoolchain-newlib: fix build when -march is set in env
  
  PR:		233812
  Submitted by:	Tassilo Philipp <tphilipp at potion-studios.com> (maintainer)

Modified:
  head/devel/psptoolchain-newlib/Makefile   (contents, props changed)

Modified: head/devel/psptoolchain-newlib/Makefile
==============================================================================
--- head/devel/psptoolchain-newlib/Makefile	Sun Dec  9 03:15:26 2018	(r487016)
+++ head/devel/psptoolchain-newlib/Makefile	Sun Dec  9 03:16:52 2018	(r487017)
@@ -23,10 +23,12 @@ BUILD_DEPENDS+=		${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}/
 
 USES=			gmake makeinfo
 HAS_CONFIGURE=		yes
-CONFIGURE_ENV=		PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PATH}
+
+# psp-gcc doesn't need -march=... in CFLAGS (e.g. set by CPUTYPE in make.conf); also need -g on psp for some reason
+CONFIGURE_ENV=		PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PATH} \
+			CFLAGS="${CFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g} -g"
 MAKE_ENV=		PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PATH}
 CONFIGURE_ARGS=		--prefix=${PREFIX} --target="psp"
-MAKE_ARGS+=		CC="${CC}" CFLAGS="${CFLAGS} -g" # Apparently, it doesn't work on the PSP without debug information
 
 # Disable installation of .info files and fix includedir reference.
 post-patch: