diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-02-09 11:06:13 +0100 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-02-09 11:06:24 +0100 |
commit | 04fb7813ab489b1d70a73351836950825b2ce4f7 (patch) | |
tree | b2dc315e19d7f1091302b85f8dc991a851978fd4 /mk/flavours | |
parent | 4ec61411930495fc109be27993c176fd7aaf486d (diff) | |
download | haskell-04fb7813ab489b1d70a73351836950825b2ce4f7.tar.gz |
Early error when crosscompiling + haddock/docs
When CrossCompiling=YES or Stage1Only=YES, building the haddocks and the
User's Guide should be skipped, because haddock and mkUserGuidePart
depend on the GHC API.
See Note [No stage2 packages when CrossCompiling or Stage1Only] for
details.
There are several places in the build system where the variables
HADDOCK_DOCS and BUILD_SPHINX_* are checked. Instead of also checking
for the variables CrossCompiling or Stage1Only in all those places,
`make` will now exit with a nice error message when the user requests
the impossible.
Reviewers: rwbarton, austin, bgamari
Reviewed By: bgamari
Differential Revision: https://phabricator.haskell.org/D1882
Diffstat (limited to 'mk/flavours')
-rw-r--r-- | mk/flavours/bench-cross.mk | 1 | ||||
-rw-r--r-- | mk/flavours/bench-llvm.mk | 1 | ||||
-rw-r--r-- | mk/flavours/bench.mk | 1 | ||||
-rw-r--r-- | mk/flavours/devel1.mk | 1 | ||||
-rw-r--r-- | mk/flavours/devel2.mk | 1 | ||||
-rw-r--r-- | mk/flavours/perf-cross.mk | 1 | ||||
-rw-r--r-- | mk/flavours/perf-llvm.mk | 1 | ||||
-rw-r--r-- | mk/flavours/perf.mk | 1 | ||||
-rw-r--r-- | mk/flavours/prof.mk | 1 | ||||
-rw-r--r-- | mk/flavours/quick-cross.mk | 1 | ||||
-rw-r--r-- | mk/flavours/quick-llvm.mk | 1 | ||||
-rw-r--r-- | mk/flavours/quick.mk | 1 | ||||
-rw-r--r-- | mk/flavours/quickest.mk | 1 | ||||
-rw-r--r-- | mk/flavours/validate.mk | 1 |
14 files changed, 0 insertions, 14 deletions
diff --git a/mk/flavours/bench-cross.mk b/mk/flavours/bench-cross.mk index 69447a2c82..15b359e259 100644 --- a/mk/flavours/bench-cross.mk +++ b/mk/flavours/bench-cross.mk @@ -6,7 +6,6 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/bench-llvm.mk b/mk/flavours/bench-llvm.mk index e07c1f34a0..2da8ddb932 100644 --- a/mk/flavours/bench-llvm.mk +++ b/mk/flavours/bench-llvm.mk @@ -6,6 +6,5 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/bench.mk b/mk/flavours/bench.mk index 1368c47f04..ad7721948b 100644 --- a/mk/flavours/bench.mk +++ b/mk/flavours/bench.mk @@ -6,6 +6,5 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/devel1.mk b/mk/flavours/devel1.mk index 8489c0fecc..ea730c9696 100644 --- a/mk/flavours/devel1.mk +++ b/mk/flavours/devel1.mk @@ -6,7 +6,6 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/devel2.mk b/mk/flavours/devel2.mk index 1f073eda9f..c86624a552 100644 --- a/mk/flavours/devel2.mk +++ b/mk/flavours/devel2.mk @@ -6,7 +6,6 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/perf-cross.mk b/mk/flavours/perf-cross.mk index 9540f8c504..669b51a3b1 100644 --- a/mk/flavours/perf-cross.mk +++ b/mk/flavours/perf-cross.mk @@ -6,7 +6,6 @@ BUILD_PROF_LIBS = YES #SplitObjs HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/perf-llvm.mk b/mk/flavours/perf-llvm.mk index 4a93d6b6bc..cd3d4f4a40 100644 --- a/mk/flavours/perf-llvm.mk +++ b/mk/flavours/perf-llvm.mk @@ -6,5 +6,4 @@ BUILD_PROF_LIBS = YES #SplitObjs #HADDOCK_DOCS #BUILD_SPHINX_HTML -#BUILD_SPHINX_PS #BUILD_SPHINX_PDF diff --git a/mk/flavours/perf.mk b/mk/flavours/perf.mk index c94b860af1..06fcc246da 100644 --- a/mk/flavours/perf.mk +++ b/mk/flavours/perf.mk @@ -6,5 +6,4 @@ BUILD_PROF_LIBS = YES #SplitObjs #HADDOCK_DOCS #BUILD_SPHINX_HTML -#BUILD_SPHINX_PS #BUILD_SPHINX_PDF diff --git a/mk/flavours/prof.mk b/mk/flavours/prof.mk index 684ffb0322..67f89e61af 100644 --- a/mk/flavours/prof.mk +++ b/mk/flavours/prof.mk @@ -6,7 +6,6 @@ BUILD_PROF_LIBS = YES SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/quick-cross.mk b/mk/flavours/quick-cross.mk index b10dbc5473..92347cae4a 100644 --- a/mk/flavours/quick-cross.mk +++ b/mk/flavours/quick-cross.mk @@ -6,7 +6,6 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/quick-llvm.mk b/mk/flavours/quick-llvm.mk index 84a80340e9..0a63f5fb88 100644 --- a/mk/flavours/quick-llvm.mk +++ b/mk/flavours/quick-llvm.mk @@ -6,6 +6,5 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/quick.mk b/mk/flavours/quick.mk index 0e045ae4b2..9f1e2e29d6 100644 --- a/mk/flavours/quick.mk +++ b/mk/flavours/quick.mk @@ -6,6 +6,5 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/quickest.mk b/mk/flavours/quickest.mk index ba956321be..69c0385f16 100644 --- a/mk/flavours/quickest.mk +++ b/mk/flavours/quickest.mk @@ -6,6 +6,5 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO BUILD_MAN = NO diff --git a/mk/flavours/validate.mk b/mk/flavours/validate.mk index cb38bd5436..1d18641227 100644 --- a/mk/flavours/validate.mk +++ b/mk/flavours/validate.mk @@ -7,7 +7,6 @@ BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = YES BUILD_SPHINX_HTML = YES -BUILD_SPHINX_PS = NO BUILD_SPHINX_PDF = NO ifeq "$(ValidateHpc)" "YES" |