From aa3a262d1537b30c21a8b887385cc538440e7a44 Mon Sep 17 00:00:00 2001 From: PHO Date: Sat, 21 Jan 2023 20:38:52 +0900 Subject: Assume platforms support rpaths if they use either ELF or Mach-O Not only Linux, Darwin, and FreeBSD support rpaths. Determine the usability of rpaths based on the object format, not on OS. --- hadrian/src/Oracles/Setting.hs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'hadrian') diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs index 462d289cd0..d8492dbe94 100644 --- a/hadrian/src/Oracles/Setting.hs +++ b/hadrian/src/Oracles/Setting.hs @@ -272,20 +272,28 @@ anyTargetArch = matchSetting TargetArch anyHostOs :: [String] -> Action Bool anyHostOs = matchSetting HostOs --- | Check whether the target OS uses the ELF object format. -isElfTarget :: Action Bool -isElfTarget = anyTargetOs +-- | List of OSes that use the ELF object format. +elfOSes :: [String] +elfOSes = [ "linux", "freebsd", "dragonfly", "openbsd", "netbsd", "solaris2", "kfreebsdgnu" , "haiku", "linux-android" ] +-- | List of OSes that use the Mach-O object format. +machoOSes :: [String] +machoOSes = [ "darwin" ] + +-- | Check whether the target OS uses the ELF object format. +isElfTarget :: Action Bool +isElfTarget = anyTargetOs elfOSes + -- | Check whether the host OS supports the @-rpath@ linker option when -- using dynamic linking. -- -- TODO: Windows supports lazy binding (but GHC doesn't currently support -- dynamic way on Windows anyways). hostSupportsRPaths :: Action Bool -hostSupportsRPaths = anyHostOs ["linux", "darwin", "freebsd"] +hostSupportsRPaths = anyHostOs (elfOSes ++ machoOSes) -- | Check whether the target supports GHCi. ghcWithInterpreter :: Action Bool -- cgit v1.2.1