diff options
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/cfg/system.config.in | 2 | ||||
| -rw-r--r-- | hadrian/src/Builder.hs | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index 7b92b29a6d..4cae2b6783 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -7,7 +7,7 @@ alex = @AlexCmd@ ar = @ArCmd@ -autoreconf = autoreconf +autoreconf = @AutoreconfCmd@ cc = @CC@ happy = @HappyCmd@ hs-cpp = @HaskellCPPCmd@ diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs index 02edb199d3..38d21b3fdd 100644 --- a/hadrian/src/Builder.hs +++ b/hadrian/src/Builder.hs @@ -288,7 +288,7 @@ systemBuilderPath builder = case builder of Alex -> fromKey "alex" Ar _ Stage0 -> fromKey "system-ar" Ar _ _ -> fromKey "ar" - Autoreconf _ -> fromKey "autoreconf" + Autoreconf _ -> stripExe =<< fromKey "autoreconf" Cc _ Stage0 -> fromKey "system-cc" Cc _ _ -> fromKey "cc" -- We can't ask configure for the path to configure! @@ -329,6 +329,18 @@ systemBuilderPath builder = case builder of (True , True ) -> fixAbsolutePathOnWindows fullPath (True , False) -> fixAbsolutePathOnWindows fullPath <&> (<.> exe) + -- Without this function, on Windows we can observe a bad builder path + -- for 'autoreconf'. If the relevant system.config field is set to + -- /usr/bin/autoreconf in the file, the path that we read + -- is C:/msys64/usr/bin/autoreconf.exe. A standard msys2 set up happens + -- to have an executable named 'autoreconf' there, without the 'exe' + -- extension. Hence this function. + stripExe s = do + let sNoExt = dropExtension s + exists <- doesFileExist s + if exists then return s else return sNoExt + + -- | Was the path to a given system 'Builder' specified in configuration files? isSpecified :: Builder -> Action Bool isSpecified = fmap (not . null) . systemBuilderPath |