Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Aug 2020 06:36:10 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545740 - head/games/veloren
Message-ID:  <202008220636.07M6aAp9004718@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Aug 22 06:36:10 2020
New Revision: 545740
URL: https://svnweb.freebsd.org/changeset/ports/545740

Log:
  games/veloren: unbreak on GCC architectures after r545731
  
  cc1: error: unrecognized command line option "-fuse-ld=lld"

Modified:
  head/games/veloren/Makefile   (contents, props changed)

Modified: head/games/veloren/Makefile
==============================================================================
--- head/games/veloren/Makefile	Sat Aug 22 06:15:04 2020	(r545739)
+++ head/games/veloren/Makefile	Sat Aug 22 06:36:10 2020	(r545740)
@@ -34,13 +34,17 @@ GL_COMMIT=	8f8b20c9139fbe1ddfb1937e3264e592d42f4fd0
 GL_TUPLE=	veloren:auth:b943c85e4a38f5ec60cd18c34c73097640162bfe:authcommon \
 		veloren:conrod:1ab6eccf94b16a8977a3274b31d4dbfef9cf9a30:conrod_core \
 		veloren:specs-idvs:fcb0b2306b571f62f9f85d89e79e087454d95efd:specsidvs
-LDFLAGS+=	-fuse-ld=lld
 INSTALLS_ICONS=	yes
 PLIST_FILES=	bin/${PORTNAME}-chat-cli \
 		bin/${PORTNAME}-server-cli \
 		bin/${PORTNAME}-voxygen \
 		share/icons/hicolor/192x192/apps/${PORTNAME}.png
 PORTDATA=	*
+
+.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
+# veloren_voxygen*rcgu* has 71718 section headers, breaking old GNU ld.bfd in base
+LDFLAGS+=	-fuse-ld=lld
+.endif
 
 DESKTOP_ENTRIES="Veloren (client)" \
 		"" \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008220636.07M6aAp9004718>