diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-03-11 11:00:58 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-03-11 11:00:58 +0000 |
| commit | 0b2bbce85ae2fc9ca99d9b98be57eb9a82c053fa (patch) | |
| tree | 045e252135eb1fce0ed62b17b2870ecdda41aa48 /mk | |
| parent | 21c190f4ace4e12304a17c8169b75213fb6ea1b4 (diff) | |
| download | haskell-0b2bbce85ae2fc9ca99d9b98be57eb9a82c053fa.tar.gz | |
FIX #2832: Setting SplitObjs=NO doesn't disable -split-objs in GHC
Now ghc --info reports whether-split-objs is supported, rather than
whether the libraries were built using -split-objs.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 6f16dd56e0..bdaed164d5 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -441,14 +441,19 @@ PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE} # 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)) + # lazy test, so that $(GhcUnregisterised) can be set in build.mk -SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\ - $(if $(filter YES,$(BootingFromHC)),\ - NO,\ - $(if $(filter NO,$(GhcUnregisterised)),\ - YES,\ - NO)),\ - NO)) +SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\ + $(if $(filter NO,$(BootingFromHc)),\ + $(if $(filter NO,$(GhcUnregisterised)),\ + YES,\ + NO),\ + NO),\ + NO)) + +# By default, enable SplitObjs for the libraries if this build supports it +SplitObjs=$(SupportsSplitObjs) # Math library LIBM=@LIBM@ |