2 files changed, 11 insertions, 0 deletions

diff --git a/ghc.mk b/ghc.mk
index 491f2d1382..bc4642e0e7 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -535,6 +535,16 @@ ifneq "$(findstring $(phase),0 1 2)" ""
 ghc_stage1_DISABLE = YES
 endif
 
+ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
+libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
+else
+    ifeq "$(INTEGER_LIBRARY)" "integer-simple"
+	libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
+    else
+	$(error Unknown integer library: $(INTEGER_LIBRARY))
+    endif
+endif
+
 ifneq "$(findstring $(phase),0 1 2 3)" ""
 # In phases 0-3, we disable stage2-3, the full libraries and haddock
 utils/haddock_dist_DISABLE = YES
diff --git a/packages b/packages
index 273e4bc262..3171bce9e6 100644
--- a/packages
+++ b/packages
@@ -35,6 +35,7 @@ libraries/haskell98                     packages/haskell98              darcs
 libraries/hpc                           packages/hpc                    darcs
 libraries/integer                       packages/integer                darcs
 libraries/integer-gmp                   packages/integer-gmp            darcs
+libraries/integer-simple                packages/integer-simple         darcs
 libraries/mtl                           packages/mtl                    darcs
 libraries/old-locale                    packages/old-locale             darcs
 libraries/old-time                      packages/old-time               darcs