Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/35166303fd96d8f71e68b3aeda294256e7e305ab >--------------------------------------------------------------- commit 35166303fd96d8f71e68b3aeda294256e7e305ab Author: Ben Lippmeier <[email protected]> Date: Fri Nov 11 17:37:14 2011 +1100 Build system wibbles for new dph-lifted-vseg library The old dph-par and dph-seq CPP libraries are gone. The DPH front end libraries are now dph-lifted-*, and are only built in one way. >--------------------------------------------------------------- ghc.mk | 10 +++++----- mk/validate-settings.mk | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ghc.mk b/ghc.mk index 8ae3e04..b076cc0 100644 --- a/ghc.mk +++ b/ghc.mk @@ -313,9 +313,11 @@ endif # Packages that are built but not installed PKGS_THAT_ARE_INTREE_ONLY := haskeline mtl terminfo utf8-string xhtml -PKGS_THAT_ARE_DPH := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \ - dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \ - vector primitive random +PKGS_THAT_ARE_DPH := \ + dph/dph-base \ + dph/dph-prim-interface dph/dph-prim-seq dph/dph-prim-par \ + dph/dph-lifted-boxed dph/dph-lifted-copy dph/dph-lifted-vseg \ + vector primitive random # Packages that, if present, must be built by the stage2 compiler, # because they use TH and/or annotations, or depend on other stage2 @@ -539,8 +541,6 @@ endif # these cases, so we just skip checking them. # NB. these must come before we include the ghc.mk files below, because # they disable the relevant rules. -CHECKED_libraries/dph/dph-seq = YES -CHECKED_libraries/dph/dph-par = YES # In compiler's case, include-dirs points outside of the source tree CHECKED_compiler = YES diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index c68858d..0516be8 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -99,8 +99,7 @@ libraries/dph/dph-base_dist-install_EXTRA_HC_OPTS += -Wwarn libraries/dph/dph-prim-interface_dist-install_EXTRA_HC_OPTS += -Wwarn libraries/dph/dph-prim-seq_dist-install_EXTRA_HC_OPTS += -Wwarn libraries/dph/dph-prim-par_dist-install_EXTRA_HC_OPTS += -Wwarn -libraries/dph/dph-seq_dist-install_EXTRA_HC_OPTS += -Wwarn -libraries/dph/dph-par_dist-install_EXTRA_HC_OPTS += -Wwarn +libraries/dph/dph-lifted-common-install_EXTRA_HC_OPTS += -Wwarn # We need to turn of deprecated warnings for SafeHaskell transition libraries/array_dist-install_EXTRA_HC_OPTS += -fno-warn-warnings-deprecations _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
