svn commit: r505480 - head/devel/psptoolchain-gcc-stage1

[Kurt Jaeger]

Author: pi
Date: Sun Jun 30 20:24:39 2019
New Revision: 505480
URL: https://svnweb.freebsd.org/changeset/ports/505480

Log:
  devel/psptoolchain-gcc-stage1: Fix build conflict
  
  - Fix build conflict when texinfo installed and when -march is set in env
  
  PR:		233546
  Submitted by:	Tassilo Philipp <tphilipp at potion-studios.com> (maintainer>
  Reviewed by:	koobs

Modified:
  head/devel/psptoolchain-gcc-stage1/Makefile

Modified: head/devel/psptoolchain-gcc-stage1/Makefile
==============================================================================
--- head/devel/psptoolchain-gcc-stage1/Makefile	Sun Jun 30 20:23:41 2019	(r505479)
+++ head/devel/psptoolchain-gcc-stage1/Makefile	Sun Jun 30 20:24:39 2019	(r505480)
@@ -54,6 +54,11 @@ CONFIGURE_ARGS?=	--prefix=${PREFIX}/${PSP_GCC_STAGE_PR
 			--mandir=${PREFIX}/man
 SSP_CFLAGS?=		-fstack-protector # XXX -strong isn't supported by GCC < 4.9
 
+# make sure xgcc doesn't get any -march=... from env C(XX)?FLAGS (e.g. set by CPUTYPE in make.conf); also "disable" info file gen
+CONFIGURE_ENV+=		CFLAGS_FOR_TARGET="${CFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g}" \
+			CXXFLAGS_FOR_TARGET="${CXXFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g}" \
+			MAKEINFO=true
+
 # Don't install any documentation for psptoolchain's gcc stage 1 - makes no sense.
 # Disable installation of .info files and libiberty for both stages.
 post-patch: