From c968f45d85d4e83fa765418b28719d87b1f4445a Mon Sep 17 00:00:00 2001
From: Kevin Tew <tewk@racket-lang.org>
Date: Mon, 5 Jul 2010 11:56:55 -0600
Subject: [PATCH] Parallel build by default

---
 collects/setup/option-unit.rkt   | 2 +-
 collects/setup/setup-cmdline.rkt | 4 ++--
 src/Makefile.in                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/collects/setup/option-unit.rkt b/collects/setup/option-unit.rkt
index 83da9676d1..3bc83ca76a 100644
--- a/collects/setup/option-unit.rkt
+++ b/collects/setup/option-unit.rkt
@@ -27,7 +27,7 @@
 
   (define setup-program-name (make-parameter "setup-plt"))
 
-  (define-flag-param parallel-build #f)
+  (define-flag-param parallel-build #t)
   (define-flag-param parallel-workers (processor-count))
   (define-flag-param verbose #f)
   (define-flag-param make-verbose #f)
diff --git a/collects/setup/setup-cmdline.rkt b/collects/setup/setup-cmdline.rkt
index dc7fbe8028..180ae58b86 100644
--- a/collects/setup/setup-cmdline.rkt
+++ b/collects/setup/setup-cmdline.rkt
@@ -41,8 +41,8 @@
                    (make-info-domain #f)
                    (parallel-build #f)
                    (make-docs #f)))]
-     [("-u" "--parallel-build") "Use parallel build"
-      (add-flags '((parallel-build #t)))]
+     [("-u" "--no-parallel-build") "Do not use parallel build"
+      (add-flags '((parallel-build #f)))]
      [("-j" "--workers") workers "Use <#> parallel-workers"
       (add-flags `((parallel-workers ,(string->number workers))))]
      [("-n" "--no-zo") "Do not produce .zo files"
diff --git a/src/Makefile.in b/src/Makefile.in
index 21d82d1ffd..92bd076046 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,7 +54,7 @@ both:
 
 # Install (common) ----------------------------------------
 
-SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "raco setup" -l- setup @INSTALL_SETUP_FLAGS@
+SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "raco setup" -l- setup $(SETUP_OPTIONS) @INSTALL_SETUP_FLAGS@
 
 install:
 	$(MAKE) install-@MAIN_VARIANT@