[Git][ghc/ghc][wip/freebsd] 2 commits: gitlab-ci: Prefer system toolchain on FreeBSD

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/freebsd at Glasgow Haskell Compiler / GHC


Commits:
fd54336a by Ben Gamari at 2024-11-21T20:38:42-05:00
gitlab-ci: Prefer system toolchain on FreeBSD

It's not uncommon to find machines with gcc installed via ports. We
should be using the system's default clang-based toolchain instead.

- - - - -
0584a454 by Ben Gamari at 2024-11-21T20:39:25-05:00
testsuite: Mark T21969 as broken on FreeBSD

Due to #25512.

- - - - -


2 changed files:

- .gitlab/generate-ci/gen_ci.hs
- testsuite/tests/concurrent/should_run/all.T


Changes:

=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -424,6 +424,9 @@ opsysVariables _ FreeBSD14 = mconcat
     "CONFIGURE_ARGS" =: "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib"
   , "CONFIGURE_ARGS" =: "--with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib"
   , "CONFIGURE_ARGS" =: "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib"
+    -- Prefer to use the system's clang-based toolchain and not gcc
+  , "CC" =: "cc"
+  , "CXX" =: "c++"
   , "GHC_VERSION" =: "9.6.4"
   , "CABAL_INSTALL_VERSION" =: "3.10.3.0"
   ]


=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -268,6 +268,7 @@ test('T21651',
 test('T21969',
      [ only_ways(['threaded1','threaded2', 'nonmoving_thr', 'profthreaded']),
        when(opsys('mingw32'),skip), # uses POSIX pipes
+       when(opsys('freebsd'), expect_broken(25512)),
        extra_run_opts('50000'),
        run_timeout_multiplier(0.3), # default timeout seems to be 300, but lockups happen quickly
        req_target_smp,



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9a07d8307dfc0b0ada9bf58f5dc7db1b68836407...0584a4546924f8a8dfcfc63a3c1ecd960691d533

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9a07d8307dfc0b0ada9bf58f5dc7db1b68836407...0584a4546924f8a8dfcfc63a3c1ecd960691d533
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241121/7f166ced/attachment-0001.html>