Hi,

After discussion of the port not building on arm64 because of the hardcoded
'as' assembler, I prepared this diff after input from sthen@ and discussion
with Bluerise (on #metabug) and help from awolk@ that changes the assembler
to clang on clang arches.

It would be great if someone could test this on arm64.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/dxx-rebirth/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile    24 Dec 2017 19:13:43 -0000      1.1.1.1
+++ Makefile    9 Jan 2018 14:42:00 -0000
@@ -34,4 +34,10 @@ NO_TEST =    Yes
 
 WRKDIST =      ${WRKDIR}/dxx-rebirth_v${V}-weekly-src
 
+.include <bsd.port.arch.mk>
+
+.if ${PROPERTIES:Mclang}
+PATCH_LIST=    patch-* clang-*
+.endif
+
 .include <bsd.port.mk>
Index: patches/clang-patch-SConstruct
===================================================================
RCS file: patches/clang-patch-SConstruct
diff -N patches/clang-patch-SConstruct
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/clang-patch-SConstruct      9 Jan 2018 14:42:00 -0000
@@ -0,0 +1,14 @@
+$OpenBSD: patch-SConstruct,v 1.1.1.1 2017/12/24 19:13:43 bcallah Exp $
+
+CLANG ARCHES ONLY: use clang as assembler in an attempt to enable arm64
+
++++ SConstruct
+@@ -648,7 +648,7 @@ help:assume C++ compiler works
+               if user_settings.show_tool_version:
+                       CXX = cenv['CXX']
+                       self._show_tool_version(context, CXX, 'C++ compiler')
+-                      self._show_indirect_tool_version(context, CXX, 'as', 
'assembler')
++                      self._show_indirect_tool_version(context, CXX, 'clang', 
'assembler')
+                       self._show_indirect_tool_version(context, CXX, 'ld', 
'linker')
+                       if use_distcc:
+                               self._show_tool_version(context, use_distcc, 
'distcc', False)

Reply via email to