[commit: ghc] wip/jenkins: More things (e29b4ff)

[git at git.haskell.org]

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

On branch  : wip/jenkins
Link       : http://ghc.haskell.org/trac/ghc/changeset/e29b4ff4c6e28d1db31b6b651d722c8e3fc3d101/ghc

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

commit e29b4ff4c6e28d1db31b6b651d722c8e3fc3d101
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu May 18 01:38:55 2017 -0400

    More things


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

e29b4ff4c6e28d1db31b6b651d722c8e3fc3d101
 Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b9fa972..04d8d84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ def installPackages(String[] pkgs) {
   sh "cabal install -j${env.THREADS} --with-compiler=`pwd`/inplace/bin/ghc-stage2 --package-db=`pwd`/inplace/lib/package.conf.d ${pkgs.join(' ')}"
 }
 
-def buildGhc(boolean runNofib, String cross_target) {
+def buildGhc(boolean runNofib, String cross_target=null) {
   stage('Clean') {
     checkout scm
     if (false) {
@@ -55,9 +55,10 @@ def buildGhc(boolean runNofib, String cross_target) {
                """
     if (cross_target) {
       build_mk += """
+                  # Cross compiling
                   HADDOCK_DOCS=NO
-                  SPHINX_HTML_DOCS=NO
-                  SPHINX_PDF_DOCS=NO
+                  BUILD_SPHINX_HTML=NO
+                  BUILD_SPHINX_PDF=NO
                   """
     }
     writeFile(file: 'mk/build.mk', text: build_mk)