diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-07-07 14:13:43 +0100 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2021-08-04 18:25:26 +0530 |
| commit | 23966d10cf3f043aa643320434cd490f435037bb (patch) | |
| tree | dfeb8cb312d025473b7bebcf50aa89d448ad4a40 | |
| parent | 8a521714343014b2606e426421243119d4a4a90f (diff) | |
| download | haskell-23966d10cf3f043aa643320434cd490f435037bb.tar.gz | |
packaging: Don't include configure scripts in windows bindist
Fixes #19868
(cherry picked from commit 5412730e009dd30e54d13d2b1e86f7e9b9bc085f)
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index 5ddfddafb6..0213362204 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -165,17 +165,19 @@ bindistRules = do -- shipping it removeFile (bindistFilesDir -/- mingwStamp) - -- We then 'need' all the files necessary to configure and install - -- (as in, './configure [...] && make install') this build on some - -- other machine. - need $ map (bindistFilesDir -/-) - (["configure", "Makefile"] ++ bindistInstallFiles) - wrappers <- fmap concat (sequence [ pkgToWrappers p | p <- all_pkgs, isProgram p]) - need $ map ((bindistFilesDir -/- "wrappers") -/-) wrappers - - --- IO.removeFile link_path <|> return () --- IO.createFileLink versioned_exe_name link_path + -- These scripts are only necessary in the configure/install + -- workflow which is not supported on windows. + -- TODO: Instead of guarding against windows, we could offer the + -- option to make a relocatable, but not installable bindist on any + -- platform. + unless windowsHost $ do + -- We then 'need' all the files necessary to configure and install + -- (as in, './configure [...] && make install') this build on some + -- other machine. + need $ map (bindistFilesDir -/-) + (["configure", "Makefile"] ++ bindistInstallFiles) + wrappers <- fmap concat (sequence [ pkgToWrappers p | p <- all_pkgs, isProgram p]) + need $ map ((bindistFilesDir -/- "wrappers") -/-) wrappers let buildBinDist :: Compressor -> Action () |