pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/mk



Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Jan  1 04:54:10 UTC 2020

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
Suppress an error occurs when buildlink is not present


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.7 pkgsrc/mk/haskell.mk:1.8
--- pkgsrc/mk/haskell.mk:1.7    Wed Jan  1 04:35:29 2020
+++ pkgsrc/mk/haskell.mk        Wed Jan  1 04:54:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.7 2020/01/01 04:35:29 pho Exp $
+# $NetBSD: haskell.mk,v 1.8 2020/01/01 04:54:10 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -150,7 +150,7 @@ _HASKELL_BIN=               ${_GHC_BIN} # Expose to t
 _HASKELL_PKG_BIN=      ${_GHC_PKG_BIN} # Expose to the outer scope.
 
 # Determine GHC version.
-_GHC_VERSION_CMD=      ${_GHC_BIN} -V | ${CUT} -d ' ' -f 8
+_GHC_VERSION_CMD=      ${_GHC_BIN} -V 2>/dev/null | ${CUT} -d ' ' -f 8
 _GHC_VERSION=          ${_GHC_VERSION_CMD:sh}
 _GHC_VERSION_FULL=     ghc-${_GHC_VERSION}
 _HASKELL_VERSION=      ${_GHC_VERSION_FULL} # Expose to the outer scope.



Home | Main Index | Thread Index | Old Index