Differential D11961 Diff 31901 head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
Changeset View
Changeset View
Standalone View
Standalone View
head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
| Show All 9 Lines | import Data.Char | ||||
| ( isDigit ) | ( isDigit ) | ||||
| import qualified Data.Map as Map | import qualified Data.Map as Map | ||||
| @@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") { | @@ -251,11 +253,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 | @@ -311,7 +315,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") { | ||||