From f693adcd7cea7107e673f4794d8168ff2deb05f7 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 12 Jan 2023 23:42:37 +0800 Subject: [PATCH] Fix FreeBSD build for text-2.0 --- .cirrus.yml | 2 +- .github/scripts/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 75f8a4c..27bb666 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,7 +15,7 @@ task: AWS_ACCESS_KEY_ID: ENCRYPTED[3e99c4ac040871f213abd616ec66952d954dc289cdd97772f88e58a74d08a2250133437780fe98b7aedf7ef1fb32f5eb] AWS_SECRET_ACCESS_KEY: ENCRYPTED[5910cfd77a922ff7fc06eeb6a6b9f79d4867863e541f06eb2c4cfecae0613650e3e0588373fa8d9249d295d76cf9cb3b] S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d] - install_script: pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake + install_script: pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14 script: - tzsetup Etc/GMT - adjkerntz -a diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 377f19e..68d3176 100644 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -56,7 +56,7 @@ if [ "${RUNNER_OS}" = "Linux" ] ; then build_with_cache -w "${GHC}" -ftui --enable-tests fi elif [ "${RUNNER_OS}" = "FreeBSD" ] ; then - build_with_cache -w "${GHC}" --ghc-options='-split-sections' --constraint="zlib +bundled-c-zlib" --constraint="zip +disable-zstd" -ftui --enable-tests + build_with_cache -w "${GHC}" --ghc-options='-split-sections -pgmc clang++14' --constraint="zlib +bundled-c-zlib" --constraint="zip +disable-zstd" -ftui --enable-tests elif [ "${RUNNER_OS}" = "Windows" ] ; then build_with_cache -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" --enable-tests else