diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-03-29 19:02:08 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-03-31 10:59:36 +0200 |
| commit | 995e8c1c8692b60c907c7d2ccea179d52ca8e69e (patch) | |
| tree | 1314ec36672d72b33a99b33e017316c0b8585625 /ghc.mk | |
| parent | 1f69f37f34c6f15fd900c2c1cce3ce896168dde9 (diff) | |
| download | haskell-995e8c1c8692b60c907c7d2ccea179d52ca8e69e.tar.gz | |
Drop old integer-gmp-0.5 from GHC source tree
This completes what c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (#9281)
started. `integer-gmp-1.0` was added as an additional
`libraries/integer-gmp2` folder while retaining the ability to configure
GHC w/ the old `integer-gmp-0.5` to have a way back, and or the ability
to easily switch between old/new `integer-gmp` for benchmark/debugging
purposes.
This commit removes the old `libraries/integer-gmp` folder and moves
`libraries/integer-gmp2` into its place, while removing any mentions of
"gmp2" as well as the to support two different `integer-gmp` packages in
GHC's source-tree.
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D769
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -587,8 +587,6 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins ifneq "$(CLEANING)" "YES" ifeq "$(INTEGER_LIBRARY)" "integer-gmp" libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-gmp -else ifeq "$(INTEGER_LIBRARY)" "integer-gmp2" -libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-gmp2 else ifeq "$(INTEGER_LIBRARY)" "integer-simple" libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple else @@ -649,16 +647,8 @@ endif ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp -BUILD_DIRS += libraries/integer-gmp/mkGmpDerivedConstants else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" BUILD_DIRS += libraries/integer-gmp/gmp -BUILD_DIRS += libraries/integer-gmp/mkGmpDerivedConstants -endif - -ifeq "$(INTEGER_LIBRARY)" "integer-gmp2" -BUILD_DIRS += libraries/integer-gmp2/gmp -else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" -BUILD_DIRS += libraries/integer-gmp2/gmp endif ifeq "$(HADDOCK_DOCS)" "YES" @@ -1233,9 +1223,7 @@ sdist_%: .PHONY: clean -CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h -CLEAN_FILES += libraries/integer-gmp2/include/HsIntegerGmp.h CLEAN_FILES += libraries/base/include/EventConfig.h CLEAN_FILES += mk/config.mk.old CLEAN_FILES += mk/project.mk.old |