svn commit: r514199 - in head: Mk www/cliqz

[Jan Beich]

Author: jbeich
Date: Thu Oct 10 00:44:57 2019
New Revision: 514199
URL: https://svnweb.freebsd.org/changeset/ports/514199

Log:
  gecko: drop LLVM_DEFAULT workaround for i386 after r514194
  
  PR:		240918

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/www/cliqz/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Wed Oct  9 23:06:05 2019	(r514198)
+++ head/Mk/bsd.gecko.mk	Thu Oct 10 00:44:57 2019	(r514199)
@@ -90,9 +90,6 @@ MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"
 
 # Require newer Clang than what's in base system unless user opted out
 . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 && ${ARCH} == i386
-LLVM_DEFAULT=	80
-.endif
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CPP=			${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=				${LOCALBASE}/bin/clang${LLVM_DEFAULT}

Modified: head/www/cliqz/Makefile
==============================================================================
--- head/www/cliqz/Makefile	Wed Oct  9 23:06:05 2019	(r514198)
+++ head/www/cliqz/Makefile	Thu Oct 10 00:44:57 2019	(r514199)
@@ -96,11 +96,6 @@ MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-crashre
 
 .include <bsd.port.pre.mk>
 
-# Default to llvm 8 for i386
-.if ${ARCH} == i386 && ${LLVM_DEFAULT:S,-devel,990,} >= 90
-LLVM_DEFAULT=	80
-.endif
-
 # Require newer Clang than what's in base system unless user opted out
 .if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}