diff options
| author | Demi Obenour <demiobenour@gmail.com> | 2017-01-10 14:32:46 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-01-10 14:32:57 -0500 |
| commit | 266a9dc4cd34008f1162eb276032c85ef8371842 (patch) | |
| tree | cea4bcb2f0d9f94224e566cd5ec861065407d6bd /mk | |
| parent | 22845adcc51b40040b9d526c36d2d36edbb11dd7 (diff) | |
| download | haskell-266a9dc4cd34008f1162eb276032c85ef8371842.tar.gz | |
Don't use the splitter on Darwin
Test Plan: GHC CI
Reviewers: austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2879
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 5f50d87a1d..f4508afb25 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -328,23 +328,24 @@ StripLibraries=NO # system needs to do other special magic if you are # doing object-file splitting -ArchSupportsSplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),YES,NO)) -OsSupportsSplitObjs=$(strip $(if $(filter $(TargetOS_CPP),mingw32 linux darwin solaris2 freebsd dragonfly netbsd openbsd),YES,NO)) +ArchSupportsSplitObjs=$(if $(filter \ + $(TargetArch_CPP),i386 x86_64 powerpc sparc),YES,NO)# + +# We used to support splitting on Darwin, but there is no point, since Darwin +# uses subsections via symbols +OsSupportsSplitObjs=$(if $(filter $(TargetOS_CPP),\ + mingw32 linux solaris2 freebsd dragonfly netbsd openbsd),YES,NO) SplitObjsBroken = @SplitObjsBroken@ -SupportsSplitObjs := $(strip \ - $(if $(and $(filter YES,$(ArchSupportsSplitObjs)),\ - $(filter YES,$(OsSupportsSplitObjs)),\ - $(filter NO,$(SplitObjsBroken)),\ - $(filter NO,$(GhcUnregisterised))),\ - YES,NO)) +SupportsSplitObjs := $(if $(and $(filter YES,$(ArchSupportsSplitObjs)),\ + $(filter YES,$(OsSupportsSplitObjs)),\ + $(filter NO,$(SplitObjsBroken)),\ + $(filter YES,$(GhcWithNativeCodeGen))),YES,NO) # By default, enable SplitObjs for the libraries if this build supports it. # Unless SplitSections is enabled - then let that take precedence. -SplitObjs = $(strip \ - $(if $(and $(filter YES,$(SupportsSplitObjs)),\ - $(filter NO,$(SplitSections))),\ - YES,NO)) +SplitObjs = $(if $(and $(filter YES,$(SupportsSplitObjs)),\ + $(filter NO,$(SplitSections))),YES,NO) # ---------------------------------------------------------------------------- # Section splitting @@ -357,11 +358,9 @@ SplitObjs = $(strip \ # # This is not supported on Darwin (where you can use subsections-via-symbols # instead) and Windows is not yet working. (See #11445 and related tickets.) -OsSupportsSplitSections=$(strip $(if $(filter $(TargetOS_CPP),mingw32 darwin),NO,YES)) -SupportsSplitSections = $(strip \ - $(if $(and $(filter YES,$(OsSupportsSplitSections)),\ - $(filter YES,$(LdIsGNULd))),\ - YES,NO)) +OsSupportsSplitSections=$(if $(filter $(TargetOS_CPP),mingw32 darwin),NO,YES) +SupportsSplitSections :=$(if $(and $(filter YES,$(OsSupportsSplitSections)),\ + $(filter YES,$(LdIsGNULd))),YES,NO) SplitSections ?= $(SupportsSplitSections) # ---------------------------------------------------------------------------- |