Does this diff also work?

Index: infrastructure/mk/arch-defines.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/arch-defines.mk,v
retrieving revision 1.69
diff -u -p -r1.69 arch-defines.mk
--- infrastructure/mk/arch-defines.mk   9 Nov 2019 15:08:09 -0000       1.69
+++ infrastructure/mk/arch-defines.mk   4 Dec 2019 10:52:45 -0000
@@ -65,7 +65,7 @@ LIBCXX = stdc++ pthread
 LIBECXX = estdc++>=17 pthread
 .endif
 
-.if ${PROPERTIES:Mlld}
+.if ${PROPERTIES:Mlld} || defined(USE_LLD) && ${USE_LLD:L} == yes
 # see llvm/tools/lld/ELF/Driver.cpp
 .  for A in aarch64.aarch64elf amd64.elf_amd64 arm.armelf i386.elf_i386 \
             mips64.elf64btsmip mips64el.elf64ltsmip powerpc.elf32ppc \
Index: textproc/mupdf/Makefile
===================================================================
RCS file: /cvs/ports/textproc/mupdf/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- textproc/mupdf/Makefile     17 Sep 2019 09:22:51 -0000      1.92
+++ textproc/mupdf/Makefile     4 Dec 2019 10:52:45 -0000
@@ -30,9 +30,11 @@ MASTER_SITES =       https://mupdf.com/downloa
 
 # https://marc.info/?l=openbsd-ports&m=156448467232400&w=2
 # possible alignment issue?
-MODULES +=     gcc4
+MODULES +=     gcc4 lang/clang
 MODGCC4_ARCHS =        armv7
 MODGCC4_LANGS =        c
+MODCLANG_ARCHS = mips64 mips64el
+MODCLANG_LANGS = c
 
 RUN_DEPENDS =  devel/desktop-file-utils \
                devel/xdg-utils
@@ -52,6 +54,10 @@ MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \
                LDFLAGS="${LDFLAGS}" LLD_EMUL="${LLD_EMUL}" \
                USE_SYSTEM_LIBS=yes \
                build=release verbose=yes
+
+.if ${MACHINE_ARCH:Mmips64*}
+USE_LLD =      Yes
+.endif
 
 FAKE_FLAGS =   prefix=${PREFIX} mandir=${PREFIX}/man
 

Reply via email to