Skip to content
Snippets Groups Projects
Commit accc8c33 authored by Cheng Shao's avatar Cheng Shao Committed by Marge Bot
Browse files

hadrian: don't depend on inplace/mingw when --enable-distro-toolchain on Windows

parent 5132754b
No related branches found
No related tags found
No related merge requests found
......@@ -34,6 +34,7 @@ import Base
import Context
import Oracles.Flag
import Oracles.Setting (setting, Setting(..))
import Oracles.Setting (settingsFileSetting, ToolchainSetting(..))
import Packages
import GHC.IO.Encoding (getFileSystemEncoding)
......@@ -239,9 +240,10 @@ instance H.Builder Builder where
Ghc {} -> do
root <- buildRoot
unlitPath <- builderPath Unlit
distro_mingw <- settingsFileSetting ToolchainSetting_DistroMinGW
return $ [ unlitPath ]
++ [ root -/- mingwStamp | windowsHost ]
++ [ root -/- mingwStamp | windowsHost, distro_mingw == "NO" ]
-- proxy for the entire mingw toolchain that
-- we have in inplace/mingw initially, and then at
-- root -/- mingw.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment