[commit: ghc] master: Don't build or test dph by default (bb00308)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bb003086599c2ac166cfb3aa710480713adb5a2f/ghc

>---------------------------------------------------------------

commit bb003086599c2ac166cfb3aa710480713adb5a2f
Author: Austin Seipp <austin at well-typed.com>
Date:   Sun Aug 10 14:10:22 2014 -0500

    Don't build or test dph by default
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

bb003086599c2ac166cfb3aa710480713adb5a2f
 mk/build.mk.sample |  4 ++--
 mk/config.mk.in    |  2 +-
 validate           | 23 ++++++++++-------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index a323884..4189882 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -66,8 +66,8 @@ V = 1
 # working on stage 2 and want to freeze stage 1 and the libraries for
 # a while.
 
-# Uncomment the following line to disable building DPH
-#BUILD_DPH=NO
+# Uncomment the following line to enable building DPH
+#BUILD_DPH=YES
 
 GhcLibWays = $(if $(filter $(DYNAMIC_GHC_PROGRAMS),YES),v dyn,v)
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7a73d46..d26684e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -791,7 +791,7 @@ HSCOLOUR_SRCS = YES
 endif
 
 # Build DPH?
-BUILD_DPH = YES
+BUILD_DPH = NO
 
 ################################################################################
 #
diff --git a/validate b/validate
index cabb86c..3e1fde6 100755
--- a/validate
+++ b/validate
@@ -22,10 +22,7 @@ Flags:
   --fast            Omit dyn way, omit binary distribution
   --slow            Build stage2 with -DDEBUG.
                     2008-07-01: 14% slower than the default.
-  --no-dph:         Skip building libraries/dph and running associated tests.
-                    In --slow mode, these tests can take a substantial amount
-                    of time, and on some platforms with broken linkers, we
-                    don't want to try compiling it.
+  --dph:            Also build libraries/dph and run associated tests.
   --help            shows this usage help.
 
   Set environment variable 'CPUS' to number of cores, to exploit
@@ -40,7 +37,7 @@ no_clean=0
 testsuite_only=0
 hpc=NO
 speed=NORMAL
-skip_dph=0
+use_dph=0
 
 while [ $# -gt 0 ]
 do
@@ -63,8 +60,8 @@ do
     --normal)
         speed=NORMAL
         ;;
-    --no-dph)
-        skip_dph=1
+    --dph)
+        use_dph=1
         ;;
     --help)
         show_help
@@ -122,10 +119,10 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    if [ $skip_dph -eq 1 ]; then
-        /usr/bin/perl -w boot --validate
-    else
+    if [ $use_dph -eq 1 ]; then
         /usr/bin/perl -w boot --validate --required-tag=dph
+    else
+        /usr/bin/perl -w boot --validate
     fi
     ./configure --prefix="$INSTDIR" $config_args
 fi
@@ -136,10 +133,10 @@ echo "Validating=YES"       >  mk/are-validating.mk
 echo "ValidateSpeed=$speed" >> mk/are-validating.mk
 echo "ValidateHpc=$hpc"     >> mk/are-validating.mk
 
-if [ $skip_dph -eq 1 ]; then
-    echo "BUILD_DPH=NO"     >> mk/are-validating.mk
-else
+if [ $use_dph -eq 1 ]; then
     echo "BUILD_DPH=YES"    >> mk/are-validating.mk
+else
+    echo "BUILD_DPH=NO"     >> mk/are-validating.mk
 fi
 
 $make -j$threads