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

Commits:

1 changed file:

Changes:

  • hadrian/src/Rules/BinaryDist.hs
    ... ... @@ -290,23 +290,25 @@ bindistRules = do
    290 290
             copyFile ("hadrian" -/- "cfg" -/- "default.target.in") (bindistFilesDir -/- "default.target.in")
    
    291 291
             copyFile ("hadrian" -/- "cfg" -/- "default.host.target.in") (bindistFilesDir -/- "default.host.target.in")
    
    292 292
     
    
    293
    -        -- todo: do we need these wrappers on windows
    
    294
    -        forM_ bin_targets $ \(pkg, _) -> do
    
    295
    -          needed_wrappers <- pkgToWrappers pkg
    
    296
    -          forM_ needed_wrappers $ \wrapper_name -> do
    
    297
    -            let suffix = if useGhcPrefix pkg
    
    298
    -                           then "ghc-" ++ version
    
    299
    -                           else version
    
    300
    -            wrapper_content <- wrapper wrapper_name
    
    301
    -            let unversioned_wrapper_path = bindistFilesDir -/- "wrappers" -/- wrapper_name
    
    302
    -                versioned_wrapper = wrapper_name ++ "-" ++ suffix
    
    303
    -                versioned_wrapper_path = bindistFilesDir -/- "wrappers" -/- versioned_wrapper
    
    304
    -            -- Write the wrapper to the versioned path
    
    305
    -            writeFile' versioned_wrapper_path wrapper_content
    
    306
    -            -- Create a symlink from the non-versioned to the versioned.
    
    307
    -            liftIO $ do
    
    308
    -              IO.removeFile unversioned_wrapper_path <|> return ()
    
    309
    -              IO.createFileLink versioned_wrapper unversioned_wrapper_path
    
    293
    +        -- These wrapper scripts are only necessary in the configure/install
    
    294
    +        -- workflow which is not supported on windows.
    
    295
    +        unless windowsHost $ do
    
    296
    +          forM_ bin_targets $ \(pkg, _) -> do
    
    297
    +            needed_wrappers <- pkgToWrappers pkg
    
    298
    +            forM_ needed_wrappers $ \wrapper_name -> do
    
    299
    +              let suffix = if useGhcPrefix pkg
    
    300
    +                            then "ghc-" ++ version
    
    301
    +                            else version
    
    302
    +              wrapper_content <- wrapper wrapper_name
    
    303
    +              let unversioned_wrapper_path = bindistFilesDir -/- "wrappers" -/- wrapper_name
    
    304
    +                  versioned_wrapper = wrapper_name ++ "-" ++ suffix
    
    305
    +                  versioned_wrapper_path = bindistFilesDir -/- "wrappers" -/- versioned_wrapper
    
    306
    +              -- Write the wrapper to the versioned path
    
    307
    +              writeFile' versioned_wrapper_path wrapper_content
    
    308
    +              -- Create a symlink from the non-versioned to the versioned.
    
    309
    +              liftIO $ do
    
    310
    +                IO.removeFile unversioned_wrapper_path <|> return ()
    
    311
    +                IO.createFileLink versioned_wrapper unversioned_wrapper_path
    
    310 312
     
    
    311 313
         let buildBinDist compressor = do
    
    312 314
               win_target <- isWinTarget