diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-25 19:20:39 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-08 10:05:16 +0200 |
| commit | 330fbbdacc71a7bb465195e24e268a947fe97412 (patch) | |
| tree | 4d469a07e26136709722a1ab0dad0a840f316f2d /mk/flavours | |
| parent | a15860749ae5353d58cc8907b291ac15d430fc8e (diff) | |
| download | haskell-330fbbdacc71a7bb465195e24e268a947fe97412.tar.gz | |
Build system: make *-cross BuildFlavours consistent (#10223)
This is a follow up to 841924c9587c10488a18e307b573720977bf4f13,
where `-fllvm` was explicitly removed from GhcStage1HcOpts for
perf-cross.
After removing -fllvm from GhcStage1HcOpts, it should be removed from
SRC_HC_OPTS as well, because SRC_HC_OPTS are added to every Haskell
compilation. That's what this patch does.
BuildFlavour bench-cross (added in ddf79ebf69fe4a6e69d69d451a6040a53b1ea12c),
is probably never used. But for consistency, also use -fllvm here, for
building stage2 and the libraries.
Reviewed by: austin
Differential Revision: https://phabricator.haskell.org/D1228
Diffstat (limited to 'mk/flavours')
| -rw-r--r-- | mk/flavours/bench-cross.mk | 4 | ||||
| -rw-r--r-- | mk/flavours/perf-cross.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/flavours/bench-cross.mk b/mk/flavours/bench-cross.mk index 9c3b68c895..496d38acc7 100644 --- a/mk/flavours/bench-cross.mk +++ b/mk/flavours/bench-cross.mk @@ -1,7 +1,7 @@ SRC_HC_OPTS = -O -H64m GhcStage1HcOpts = -O -GhcStage2HcOpts = -O0 -GhcLibHcOpts = -O2 +GhcStage2HcOpts = -O0 -fllvm +GhcLibHcOpts = -O2 -fllvm BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO diff --git a/mk/flavours/perf-cross.mk b/mk/flavours/perf-cross.mk index 3fcc199098..0dd9c33cfe 100644 --- a/mk/flavours/perf-cross.mk +++ b/mk/flavours/perf-cross.mk @@ -1,7 +1,7 @@ -SRC_HC_OPTS = -O -H64m -fllvm +SRC_HC_OPTS = -O -H64m GhcStage1HcOpts = -O2 GhcStage2HcOpts = -O2 -fllvm -GhcLibHcOpts = -O2 +GhcLibHcOpts = -O2 -fllvm BUILD_PROF_LIBS = YES #SplitObjs HADDOCK_DOCS = NO |