diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-14 18:59:00 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-14 19:20:02 +0100 |
| commit | b0379819e46796047c1574a6abccf186afd27afa (patch) | |
| tree | 01d3429750dea9f3fb4971b640339eef63e9307a | |
| parent | c7d559d40432cbd5f7e22df64885a435dbcfe2f9 (diff) | |
| download | haskell-b0379819e46796047c1574a6abccf186afd27afa.tar.gz | |
Update `binary` submodule to final 0.7.2.3 release
This also introduces a "bootstrap" `cabal_macros.h` header to provide
the `MIN_VERSION_base()` macro during Cabal bootstrapping which as it is
now used by `binary`.
| m--------- | libraries/binary | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/cabal_macros_boot.h | 21 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/libraries/binary b/libraries/binary -Subproject 03adb0aa2c17ce044586e3a30edc13e5cc83f69 +Subproject a3edce4b95b82388997929424ce98b1d7a75350 diff --git a/utils/ghc-cabal/cabal_macros_boot.h b/utils/ghc-cabal/cabal_macros_boot.h new file mode 100644 index 0000000000..41cddb107d --- /dev/null +++ b/utils/ghc-cabal/cabal_macros_boot.h @@ -0,0 +1,21 @@ +/* defines a few MIN_VERSION_...() macros used by some of the bootstrap packages */ + +#if __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) +#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) +#endif diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index b8d54abfcb..3ac864f384 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -39,6 +39,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \ -DCABAL_VERSION=$(CABAL_VERSION) \ -DBOOTSTRAPPING \ + -optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \ -odir bootstrapping \ -hidir bootstrapping \ -ilibraries/Cabal/Cabal \ |