Add SplitSections = NO to build flavors with SplitObjs = NO

Test Plan: harbormaster

Reviewers: nomeata, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie, snowleopard

Differential Revision: https://phabricator.haskell.org/D3276

11 files changed, 11 insertions, 0 deletions

diff --git a/mk/flavours/bench-cross.mk b/mk/flavours/bench-cross.mk
index 90344fc3ac..ae67f34d17 100644
--- a/mk/flavours/bench-cross.mk
+++ b/mk/flavours/bench-cross.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0 -fllvm
 GhcLibHcOpts       = -O2 -fllvm
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/bench-llvm.mk b/mk/flavours/bench-llvm.mk
index 2da8ddb932..9b71005615 100644
--- a/mk/flavours/bench-llvm.mk
+++ b/mk/flavours/bench-llvm.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0
 GhcLibHcOpts       = -O2
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/bench.mk b/mk/flavours/bench.mk
index ad7721948b..0a7cf80fbd 100644
--- a/mk/flavours/bench.mk
+++ b/mk/flavours/bench.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0
 GhcLibHcOpts       = -O2
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/devel1.mk b/mk/flavours/devel1.mk
index ea730c9696..8c8925c934 100644
--- a/mk/flavours/devel1.mk
+++ b/mk/flavours/devel1.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O
 GhcLibHcOpts       = -O -dcore-lint
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/devel2.mk b/mk/flavours/devel2.mk
index c86624a552..34808a3c9b 100644
--- a/mk/flavours/devel2.mk
+++ b/mk/flavours/devel2.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0 -DDEBUG
 GhcLibHcOpts       = -O -dcore-lint
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/prof-llvm.mk b/mk/flavours/prof-llvm.mk
index b54fabd66e..dcbd6a4bab 100644
--- a/mk/flavours/prof-llvm.mk
+++ b/mk/flavours/prof-llvm.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O
 GhcLibHcOpts       = -O
 BUILD_PROF_LIBS    = YES
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/quick-cross.mk b/mk/flavours/quick-cross.mk
index b886a8da9f..f0f00d28ac 100644
--- a/mk/flavours/quick-cross.mk
+++ b/mk/flavours/quick-cross.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0 -fllvm
 GhcLibHcOpts       = -O -fllvm
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/quick-llvm.mk b/mk/flavours/quick-llvm.mk
index 0a63f5fb88..8a5c5e1c26 100644
--- a/mk/flavours/quick-llvm.mk
+++ b/mk/flavours/quick-llvm.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0
 GhcLibHcOpts       = -O
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/quick.mk b/mk/flavours/quick.mk
index 9f1e2e29d6..735de6a71d 100644
--- a/mk/flavours/quick.mk
+++ b/mk/flavours/quick.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0
 GhcLibHcOpts       = -O
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/quickest.mk b/mk/flavours/quickest.mk
index 69c0385f16..61e091c54b 100644
--- a/mk/flavours/quickest.mk
+++ b/mk/flavours/quickest.mk
@@ -4,6 +4,7 @@ GhcStage2HcOpts    = -O0
 GhcLibHcOpts       = -O0
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = NO
 BUILD_SPHINX_HTML  = NO
 BUILD_SPHINX_PDF   = NO
diff --git a/mk/flavours/validate.mk b/mk/flavours/validate.mk
index 1d18641227..57831035d7 100644
--- a/mk/flavours/validate.mk
+++ b/mk/flavours/validate.mk
@@ -5,6 +5,7 @@ GhcStage2HcOpts    = -O -dcore-lint
 GhcLibHcOpts       = -O -dcore-lint
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
+SplitSections      = NO
 HADDOCK_DOCS       = YES
 BUILD_SPHINX_HTML  = YES
 BUILD_SPHINX_PDF   = NO