[commit: ghc] master: Reformat build flavours in build.mk.sample (#10223) (3749c05)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3749c05216339df60e1ffbb28c8b957ad5020b00/ghc

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

commit 3749c05216339df60e1ffbb28c8b957ad5020b00
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Apr 1 19:24:13 2015 +0200

    Reformat build flavours in build.mk.sample (#10223)
    
    Use same format for each build flavour, to make it easier to compare
    them. Refactoring only.
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D782


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

3749c05216339df60e1ffbb28c8b957ad5020b00
 mk/build.mk.sample | 53 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index fd20e69..d016e84 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -89,8 +89,13 @@ GhcStage1HcOpts = -O $(GhcFAsm)
 GhcStage2HcOpts = -O2 $(GhcFAsm)
 GhcHcOpts       = -Rghc-timing
 GhcLibHcOpts    = -O2
-GhcLibWays     += p
+#SplitObjs
+#HADDOCK_DOCS
+#BUILD_DOCBOOK_HTML
+#BUILD_DOCBOOK_PS
+#BUILD_DOCBOOK_PDF
 
+GhcLibWays += p
 ifeq "$(PlatformSupportsSharedLibs)" "YES"
 GhcLibWays += dyn
 endif
@@ -106,6 +111,12 @@ GhcStage1HcOpts = -O -fllvm
 GhcStage2HcOpts = -O2 -fllvm
 GhcHcOpts       = -Rghc-timing
 GhcLibHcOpts    = -O2
+#SplitObjs
+#HADDOCK_DOCS
+#BUILD_DOCBOOK_HTML
+#BUILD_DOCBOOK_PS
+#BUILD_DOCBOOK_PDF
+
 GhcLibWays     += p
 
 endif
@@ -114,20 +125,21 @@ endif
 
 ifeq "$(BuildFlavour)" "perf-cross"
 
-SRC_HC_OPTS     = -O -H64m -fllvm
-GhcStage1HcOpts = -O2
-GhcStage2HcOpts = -O2 -fllvm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-INTEGER_LIBRARY    = integer-simple
-Stage1Only         = YES
-
+SRC_HC_OPTS        = -O -H64m -fllvm
+GhcStage1HcOpts    = -O2
+GhcStage2HcOpts    = -O2 -fllvm
+GhcHcOpts          = -Rghc-timing
+GhcLibHcOpts       = -O2
+#SplitObjs
 HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
 
+GhcLibWays        += p
+
+INTEGER_LIBRARY      = integer-simple
+Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
 
@@ -194,9 +206,9 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
-INTEGER_LIBRARY    = integer-simple
-Stage1Only         = YES
 
+INTEGER_LIBRARY      = integer-simple
+Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
 
@@ -210,16 +222,15 @@ SRC_HC_OPTS        = -H64m -O0 $(GhcFAsm)
 GhcStage1HcOpts    = -O $(GhcFAsm)
 GhcStage2HcOpts    = -O $(GhcFAsm)
 GhcLibHcOpts       = -O $(GhcFAsm)
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
 SplitObjs          = NO
 HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
 
+GhcLibWays        += p
+GhcProfiled        = YES
+
 endif
 
 # -------- A Development build (stage 1) --------------------------------------
@@ -227,14 +238,15 @@ endif
 ifeq "$(BuildFlavour)" "devel1"
 
 SRC_HC_OPTS        = -H64m -O $(GhcFAsm)
-GhcLibHcOpts       = -O -dcore-lint
 GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
 GhcStage2HcOpts    = -Rghc-timing -O $(GhcFAsm)
+GhcLibHcOpts       = -O -dcore-lint
 SplitObjs          = NO
 HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+
 LAX_DEPENDENCIES   = YES
 
 endif
@@ -244,14 +256,15 @@ endif
 ifeq "$(BuildFlavour)" "devel2"
 
 SRC_HC_OPTS        = -H64m -O $(GhcFAsm)
-GhcLibHcOpts       = -O -dcore-lint
 GhcStage1HcOpts    = -Rghc-timing -O $(GhcFAsm)
 GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
+GhcLibHcOpts       = -O -dcore-lint
 SplitObjs          = NO
 HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+
 LAX_DEPENDENCIES   = YES
 
 endif
@@ -297,13 +310,13 @@ GhcStage1HcOpts    = -O $(GhcFAsm)
 GhcStage2HcOpts    = -O0 $(GhcFAsm)
 GhcLibHcOpts       = -O2 $(GhcFAsm)
 SplitObjs          = NO
-INTEGER_LIBRARY    = integer-simple
-Stage1Only         = YES
 HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
 
+INTEGER_LIBRARY      = integer-simple
+Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO