svn commit: r495227 - head/lang/gcc7

[Gerald Pfeifer]

Author: gerald
Date: Sun Mar 10 05:22:49 2019
New Revision: 495227
URL: https://svnweb.freebsd.org/changeset/ports/495227

Log:
  No longer require a not too old version of GCC to build on powerpc64, but
  rely on the system compiler (even if that means we need to be explicitly
  conservative when it comes to optimizations). [1]
  
  Simplify the creation of the multilib-related sub-directory tree on
  powerpc64 and avoid leaving an empty directory behind on the way. [2]
  
  PR:		235975 [1], 235964 [2], 231804 [2]
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl> [1]
  Discussed with:	Piotr Kubaj <pkubaj at anongoth.pl> [2]

Modified:
  head/lang/gcc7/Makefile

Modified: head/lang/gcc7/Makefile
==============================================================================
--- head/lang/gcc7/Makefile	Sun Mar 10 04:59:31 2019	(r495226)
+++ head/lang/gcc7/Makefile	Sun Mar 10 05:22:49 2019	(r495227)
@@ -60,9 +60,7 @@ CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif ${ARCH} == powerpc64
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
-USE_GCC=	5	# This port requires at least GCC 4.9, and we need
-			# to ensure not to cause a dependency on itself (so
-			# USE_GCC=yes or USE_GCC=X+ are not an option).
+MAKE_ARGS+=	CFLAGS_FOR_TARGET="-O1" CXXFLAGS_FOR_TARGET="-O1" BOOT_CFLAGS="-O1" # PR235975
 
 .elif ${ARCH} == powerpcspe
 CONFIGURE_ARGS+=	--with-cpu=8548 --enable-e500_double --without-fp
@@ -141,8 +139,8 @@ post-stage:
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MMULTILIB}
-	${MKDIR} ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
-	${MV} ${STAGEDIR}${PREFIX}/lib/lib32/* ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
+	${MKDIR} ${STAGEDIR}${TARGLIB32}
+	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}