diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-11-02 14:35:01 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-02 17:03:54 -0400 |
| commit | d9b6015d1942aa176e85bb71f34200bab54e1c9c (patch) | |
| tree | 416d1dca0af01e30570b8aa6ce662e12579c8b59 /ghc.mk | |
| parent | bd765f4b1332b3d2a7908de3f9ff1d50da0e0b1d (diff) | |
| download | haskell-d9b6015d1942aa176e85bb71f34200bab54e1c9c.tar.gz | |
Revert "Move check-ppr and check-api-annotations to testsuite/utils"
Unfortunately this (ironically) ended up breaking bindist testing since
we didn't have a package-data.mk. Unfortunately there is no easy way to
fix this.
This reverts commit 1e9f90af7311c33de0f7f5b7dba594725596d675.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 34 |
1 files changed, 6 insertions, 28 deletions
@@ -560,8 +560,8 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # all the other libraries' package-data.mk files. utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk utils/ghctags/dist-install/package-data.mk: compiler/stage2/package-data.mk -testsuite/utils/check-api-annotations/dist-install/package-data.mk: compiler/stage2/package-data.mk -testsuite/utils/check-ppr/dist-install/package-data.mk: compiler/stage2/package-data.mk +utils/check-api-annotations/dist-install/package-data.mk: compiler/stage2/package-data.mk +utils/check-ppr/dist-install/package-data.mk: compiler/stage2/package-data.mk # add the final package.conf dependency: ghc-prim depends on RTS libraries/ghc-prim/dist-install/package-data.mk : rts/dist/package.conf.inplace @@ -684,6 +684,8 @@ BUILD_DIRS += utils/hsc2hs BUILD_DIRS += utils/ghc-pkg BUILD_DIRS += utils/testremove BUILD_DIRS += utils/ghctags +BUILD_DIRS += utils/check-api-annotations +BUILD_DIRS += utils/check-ppr BUILD_DIRS += utils/ghc-cabal BUILD_DIRS += utils/hpc BUILD_DIRS += utils/runghc @@ -693,19 +695,6 @@ BUILD_DIRS += utils/count_lines BUILD_DIRS += utils/compare_sizes BUILD_DIRS += iserv -# If we are in a tree derived from a source tarball the testsuite/ directory may -# not exist, meaning we can't build the testsuite/utils packages. -ifeq "$(wildcard testsuite/Makefile)" "" -HaveTestsuite = NO -else -HaveTestsuite = YES -endif - -ifeq "$(HaveTestsuite)" "YES" -BUILD_DIRS += testsuite/utils/check-api-annotations -BUILD_DIRS += testsuite/utils/check-ppr -endif - # ---------------------------------------------- # Actually include the sub-ghc.mk's @@ -745,8 +734,8 @@ ifneq "$(CrossCompiling) $(Stage1Only)" "NO NO" # See Note [No stage2 packages when CrossCompiling or Stage1Only]. # See Note [Stage1Only vs stage=1] in mk/config.mk.in. BUILD_DIRS := $(filter-out utils/ghctags,$(BUILD_DIRS)) -BUILD_DIRS := $(filter-out testsuite/utils/check-api-annotations,$(BUILD_DIRS)) -BUILD_DIRS := $(filter-out testsuite/utils/check-ppr,$(BUILD_DIRS)) +BUILD_DIRS := $(filter-out utils/check-api-annotations,$(BUILD_DIRS)) +BUILD_DIRS := $(filter-out utils/check-ppr,$(BUILD_DIRS)) endif endif # CLEANING @@ -1583,14 +1572,3 @@ phase_0_builds: $(utils/deriveConstants_dist_depfile_c_asm) .PHONY: phase_1_builds phase_1_builds: $(PACKAGE_DATA_MKS) - -# Various utilities in testsuite/utils which must be built before -# the testsuite is run. -.PHONY: testsuite_utils -testsuite_utils: -ifeq "$(HaveTestsuite)" "NO" - @echo "The testsuite/ directory appears to be unavailable." - @echo "" - @echo "If this tree is from a source tarball please download and extract" - @echo "the corresponding testsuite tarball." -endif |