Build system: make *-cross BuildFlavours consistent (#10223)
authorThomas Miedema <thomasmiedema@gmail.com>
Tue, 25 Aug 2015 17:20:39 +0000 (19:20 +0200)
committerThomas Miedema <thomasmiedema@gmail.com>
Tue, 8 Sep 2015 08:05:16 +0000 (10:05 +0200)
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

mk/flavours/bench-cross.mk
mk/flavours/perf-cross.mk

index 9c3b68c..496d38a 100644 (file)
@@ -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
index 3fcc199..0dd9c33 100644 (file)
@@ -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