diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-08-15 13:47:59 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-08-15 13:47:59 +0000 |
| commit | eb586af1a1eaa107138dd38eaadacf842b9b0b4d (patch) | |
| tree | af517b7d4cea3122970e87d23a18bb3e1002c860 | |
| parent | 3fb074b5fcfd91fe0d37af83f221450ac4734908 (diff) | |
| download | haskell-eb586af1a1eaa107138dd38eaadacf842b9b0b4d.tar.gz | |
Disable object splitting on OSX; works around #4013
| -rw-r--r-- | mk/config.mk.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 290db85a22..8cc3d2eec8 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -291,15 +291,16 @@ PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE} # doing object-file splitting ArchSupportsSplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),YES,NO)) +# Object splitting is disabled on darwin due to #4013 +OsSupportsSplitObjs=$(strip $(if $(filter $(TargetOS_CPP),mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd),YES,NO)) # lazy test, so that $(GhcUnregisterised) can be set in build.mk -SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\ - $(if $(filter NO,$(BootingFromHc)),\ - $(if $(filter NO,$(GhcUnregisterised)),\ - YES,\ - NO),\ - NO),\ - NO)) +SupportsSplitObjs=$(strip \ + $(if $(and $(filter YES,$(ArchSupportsSplitObjs)),\ + $(filter YES,$(OsSupportsSplitObjs)),\ + $(filter NO,$(BootingFromHc)),\ + $(filter NO,$(GhcUnregisterised))),\ + YES,NO)) # By default, enable SplitObjs for the libraries if this build supports it SplitObjs=$(SupportsSplitObjs) |