Page MenuHomeFreeBSD
Differential D15005 Diff 41242 lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs

Changeset View

Standalone View

View Options

lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs

--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-01-03 15:59:20 UTC --- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-11-28 16:40:34 UTC
+++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs +++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
@@ -54,6 +54,8 @@ import Distribution.Compat.Exception @@ -59,6 +59,8 @@ import Distribution.Compat.Exception
import Distribution.Verbosity import Distribution.Verbosity
import Distribution.Version import Distribution.Version
+import System.FilePath (takeDirectory) +import System.FilePath (takeDirectory)
+ +
import Data.Char
( isDigit )
import qualified Data.Map as Map import qualified Data.Map as Map
@@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") {
-- ------------------------------------------------------------
@@ -265,11 +267,13 @@ alexProgram = (simpleProgram "alex") {
gccProgram :: Program gccProgram :: Program
gccProgram = (simpleProgram "gcc") { gccProgram = (simpleProgram "gcc") {
- programFindVersion = findProgramVersion "-dumpversion" id - programFindVersion = findProgramVersion "-dumpversion" id
- } - }
+ programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%" + programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
+} +}
arProgram :: Program arProgram :: Program
-arProgram = simpleProgram "ar" -arProgram = simpleProgram "ar"
+arProgram = (simpleProgram "ar") { +arProgram = (simpleProgram "ar") {
+ programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%" + programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%"
+} +}
stripProgram :: Program stripProgram :: Program
stripProgram = (simpleProgram "strip") { stripProgram = (simpleProgram "strip") {
@@ -311,7 +315,9 @@ greencardProgram :: Program @@ -337,7 +341,9 @@ greencardProgram :: Program
greencardProgram = simpleProgram "greencard" greencardProgram = simpleProgram "greencard"
ldProgram :: Program ldProgram :: Program
-ldProgram = simpleProgram "ld" -ldProgram = simpleProgram "ld"
+ldProgram = (simpleProgram "ld") { +ldProgram = (simpleProgram "ld") {
+ programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%" + programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%"
+ } + }
tarProgram :: Program tarProgram :: Program
tarProgram = (simpleProgram "tar") { tarProgram = (simpleProgram "tar") {