git: de50553fb56a - 2023Q2 - Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Apr 2023 17:26:15 UTC
The branch 2023Q2 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=de50553fb56aa92fdc040938a64e9b2529ffca71 commit de50553fb56aa92fdc040938a64e9b2529ffca71 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-04-25 17:23:03 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-04-25 17:26:11 +0000 Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4 Reported by: pkg-fallout (cherry picked from commit f9a1f46c48e1f50246e63be780bfd0b65d9800d7) --- Mk/Uses/cabal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index dfed8484b646..92dbec7a9553 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -81,8 +81,8 @@ IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT} BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386 . endif -. if ${OSVERSION} >= 1301000 && ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*} -# Band-aids for a Clang bug that is shipped with FreeBSD 13.1 +. if ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*} +# Band-aids for a Clang bug that is shipped with FreeBSD < 13.2 BUILD_DEPENDS+= clang15:devel/llvm15 BUILD_ARGS+= --ghc-options='-pgmc clang++15' . endif