svn commit: r454900 - head/lang/gcc6

[Gerald Pfeifer]

Author: gerald
Date: Sat Nov 25 22:52:32 2017
New Revision: 454900
URL: https://svnweb.freebsd.org/changeset/ports/454900

Log:
  Rework the architecture-specific special settings, sorting snippets and
  using .elif instead of distinct .if sequences, similar to most of the
  other lang/gcc* ports by now. (This being the default port we usually
  let changes settle elsewhere first.)

Modified:
  head/lang/gcc6/Makefile

Modified: head/lang/gcc6/Makefile
==============================================================================
--- head/lang/gcc6/Makefile	Sat Nov 25 22:15:12 2017	(r454899)
+++ head/lang/gcc6/Makefile	Sat Nov 25 22:52:32 2017	(r454900)
@@ -66,14 +66,8 @@ CONFIGURE_ARGS+=	--disable-multilib
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
-.endif
 
-.if ${ARCH} == powerpc64
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
-USE_GCC=	5	# Cannot require ourselves, needs to be at least 4.9.
-.endif
-
-.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
+.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 . if ${COMPILER_TYPE} == clang
 .  if empty(PORT_OPTIONS:MBOOTSTRAP)
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
@@ -81,6 +75,10 @@ MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512
 .  endif
 . endif
+
+.elif ${ARCH} == powerpc64
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+USE_GCC=	5	# Cannot require ourselves, needs to be at least 4.9.
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran