Page MenuHomeFreeBSD
Files F150612511

D11961.diff
No OneTemporary
Actions

D11961.diff
View Options

Index: head/lang/ghc/Makefile
===================================================================
--- head/lang/ghc/Makefile
+++ head/lang/ghc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ghc
PORTVERSION= ${GHC_VERSION}
+PORTREVISION= 1
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
LOCAL/pgj/:boot
@@ -190,7 +191,7 @@
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+ @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
s|%%AR%%|${AR}|; \
s|%%LD%%|${LD}|' \
${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
Index: head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
===================================================================
--- head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -15,13 +15,13 @@
gccProgram = (simpleProgram "gcc") {
- programFindVersion = findProgramVersion "-dumpversion" id
- }
-+ programFindLocation = \v p -> findProgramOnSearchPath v p "cc"
++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
+}
arProgram :: Program
-arProgram = simpleProgram "ar"
+arProgram = (simpleProgram "ar") {
-+ programFindLocation = \v p -> findProgramOnSearchPath v p "ar"
++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%"
+}
stripProgram :: Program
@@ -32,7 +32,7 @@
ldProgram :: Program
-ldProgram = simpleProgram "ld"
+ldProgram = (simpleProgram "ld") {
-+ programFindLocation = \v p -> findProgramOnSearchPath v p "ld"
++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%"
+ }
tarProgram :: Program

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 7:38 PM (13 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30775815
Default Alt Text
D11961.diff (1 KB)

Event Timeline