[Git][ghc/ghc][master] 3 commits: Revert "Change hostSupportsRPaths to report False on OpenBSD"

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
2b53f206 by Greg Steuck at 2023-05-22T20:23:11-04:00
Revert "Change hostSupportsRPaths to report False on OpenBSD"

This reverts commit 1e0d8fdb55a38ece34fa6cf214e1d2d46f5f5bf2.

- - - - -
882e43b7 by Greg Steuck at 2023-05-22T20:23:11-04:00
Disable T17414 on OpenBSD

Like on other systems it's not guaranteed that there's sufficient
space in /tmp to write 2G out.

- - - - -
9d531f9a by Greg Steuck at 2023-05-22T20:23:11-04:00
Bring back getExecutablePath to getBaseDir on OpenBSD

Fix #18173

- - - - -


3 changed files:

- hadrian/src/Oracles/Setting.hs
- libraries/base/tests/IO/all.T
- libraries/ghc-boot/GHC/BaseDir.hs


Changes:

=====================================
hadrian/src/Oracles/Setting.hs
=====================================
@@ -291,10 +291,7 @@ isElfTarget = anyTargetOs elfOSes
 -- TODO: Windows supports lazy binding (but GHC doesn't currently support
 --       dynamic way on Windows anyways).
 hostSupportsRPaths :: Action Bool
-hostSupportsRPaths = do
-  -- https://gitlab.haskell.org/ghc/ghc/-/issues/23011
-  isOpenBSD <- anyHostOs ["openbsd"]
-  if not isOpenBSD then anyHostOs (elfOSes ++ machoOSes) else pure False
+hostSupportsRPaths = anyHostOs (elfOSes ++ machoOSes)
 
 -- | Check whether the target supports GHCi.
 ghcWithInterpreter :: Action Bool


=====================================
libraries/base/tests/IO/all.T
=====================================
@@ -155,6 +155,7 @@ test('T17414',
       # distributions. This test needs to create a large file which will exceed the
       # size of this filesystem consequently we must skip it (see #17459).
       when(opsys('linux'), skip),
+      when(opsys('openbsd'), skip),
       high_memory_usage],
      compile_and_run, [''])
 test('T17510', expect_broken(17510), compile_and_run, [''])


=====================================
libraries/ghc-boot/GHC/BaseDir.hs
=====================================
@@ -24,7 +24,7 @@ import Data.List (stripPrefix)
 import Data.Maybe (listToMaybe)
 import System.FilePath
 
-#if MIN_VERSION_base(4,17,0)
+#if MIN_VERSION_base(4,17,0) && !defined(openbsd_HOST_OS)
 import System.Environment (executablePath)
 #else
 import System.Environment (getExecutablePath)
@@ -45,8 +45,10 @@ expandPathVar var value str
 expandPathVar var value (x:xs) = x : expandPathVar var value xs
 expandPathVar _ _ [] = []
 
-#if !MIN_VERSION_base(4,17,0)
--- Polyfill for base-4.17 executablePath
+#if !MIN_VERSION_base(4,17,0) || defined(openbsd_HOST_OS)
+-- Polyfill for base-4.17 executablePath and OpenBSD which doesn't
+-- have executablePath. The best it can do is use argv[0] which is
+-- good enough for most uses of getBaseDir.
 executablePath :: Maybe (IO (Maybe FilePath))
 executablePath = Just (Just <$> getExecutablePath)
 #elif !MIN_VERSION_base(4,18,0) && defined(js_HOST_ARCH)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/15b93d2f89464800465afa3a35151b904bddc730...9d531f9a3f9100467460508e928c7bdfba76aad7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/15b93d2f89464800465afa3a35151b904bddc730...9d531f9a3f9100467460508e928c7bdfba76aad7
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/20230522/552d55bf/attachment-0001.html>