[commit: ghc] ghc-8.0: Update cabal_macros_boot.h (12288de)

git at git.haskell.org git at git.haskell.org
Tue Feb 2 21:44:51 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/12288de0d9456fcb296f4d629f5237236d644870/ghc

>---------------------------------------------------------------

commit 12288de0d9456fcb296f4d629f5237236d644870
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Feb 2 22:07:05 2016 +0100

    Update cabal_macros_boot.h
    
    the MIN_VERSION_bytestring() macro is going to be needed
    for the upcoming binary update
    
    (cherry picked from commit 92c46a447e676fc15d014b4d6aa20052ff9ba1d3)


>---------------------------------------------------------------

12288de0d9456fcb296f4d629f5237236d644870
 utils/ghc-cabal/cabal_macros_boot.h | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/utils/ghc-cabal/cabal_macros_boot.h b/utils/ghc-cabal/cabal_macros_boot.h
index e0e18b5..a2da63a 100644
--- a/utils/ghc-cabal/cabal_macros_boot.h
+++ b/utils/ghc-cabal/cabal_macros_boot.h
@@ -1,27 +1,38 @@
 /* defines a few MIN_VERSION_...() macros used by some of the bootstrap packages */
 
 #if __GLASGOW_HASKELL__ >= 711
-/* package base-4.8.1.0 */
+/* package base-4.9.0.0 */
 # define MIN_VERSION_base(major1,major2,minor) (\
   (major1) <  4 || \
-  (major1) == 4 && (major2) <  8 || \
-  (major1) == 4 && (major2) == 8 && (minor) <= 1)
+  (major1) == 4 && (major2) <  9 || \
+  (major1) == 4 && (major2) == 9 && (minor) <= 0)
+/* package bytestring-0.10.8 */
+# define MIN_VERSION_bytestring(major1,major2,minor) (\
+  (major1) <  0 || \
+  (major1) == 0 && (major2) <  10 || \
+  (major1) == 0 && (major2) == 10 && (minor) <= 8)
+
 #elif __GLASGOW_HASKELL__ >= 709
 /* package base-4.8.0.0 */
 # define MIN_VERSION_base(major1,major2,minor) (\
   (major1) <  4 || \
   (major1) == 4 && (major2) <  8 || \
   (major1) == 4 && (major2) == 8 && (minor) <= 0)
+/* package bytestring-0.10.6 */
+# define MIN_VERSION_bytestring(major1,major2,minor) (\
+  (major1) <  0 || \
+  (major1) == 0 && (major2) <  10 || \
+  (major1) == 0 && (major2) == 10 && (minor) <= 6)
+
 #elif __GLASGOW_HASKELL__ >= 707
 /* package base-4.7.0 */
 # define MIN_VERSION_base(major1,major2,minor) (\
   (major1) <  4 || \
   (major1) == 4 && (major2) <  7 || \
   (major1) == 4 && (major2) == 7 && (minor) <= 0)
-#elif __GLASGOW_HASKELL__ >= 705
-/* package base-4.6.0 */
-# define MIN_VERSION_base(major1,major2,minor) (\
-  (major1) <  4 || \
-  (major1) == 4 && (major2) <  6 || \
-  (major1) == 4 && (major2) == 6 && (minor) <= 0)
+/* package bytestring-0.10.4 */
+# define MIN_VERSION_bytestring(major1,major2,minor) (\
+  (major1) <  0 || \
+  (major1) == 0 && (major2) <  10 || \
+  (major1) == 0 && (major2) == 10 && (minor) <= 4)
 #endif



More information about the ghc-commits mailing list