Repository : ssh://darcs.haskell.org//srv/darcs/nofib On branch : master
http://hackage.haskell.org/trac/ghc/changeset/730aa6b235d2d4ffb1fac784babe65f95a887e2a >--------------------------------------------------------------- commit 730aa6b235d2d4ffb1fac784babe65f95a887e2a Author: Ian Lynagh <[email protected]> Date: Tue May 28 20:48:28 2013 +0100 Get the value of SplitObjs from the compiler we're using >--------------------------------------------------------------- mk/boilerplate.mk | 5 +++++ mk/ghc-target.mk | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk index b838b94..b4595f6 100644 --- a/mk/boilerplate.mk +++ b/mk/boilerplate.mk @@ -106,7 +106,12 @@ define get-ghc-rts-field # $1 = result variable, $2 = field name $1 := $$(shell '$$(HC)' +RTS --info | grep '^ .("$2",' | tr -d '\r' | sed -e 's/.*", *"//' -e 's/")$$$$//') endef +define get-ghc-field # $1 = result variable, $2 = field name +$1 := $$(shell '$$(HC)' --info | grep '^ .("$2",' | tr -d '\r' | sed -e 's/.*", *"//' -e 's/")$$$$//') +endef + $(eval $(call get-ghc-rts-field,HC_VERSION,GHC version)) +$(eval $(call get-ghc-field,SplitObjs,Object splitting supported)) define ghc-ge # $1 = major version, $2 = minor version HC_VERSION_GE_$1_$2 := $$(shell if [ `echo $$(HC_VERSION) | sed 's/\..*//'` -gt $1 ]; then echo YES; else if [ `echo $$(HC_VERSION) | sed 's/\..*//'` -ge $1 ] && [ `echo $$(HC_VERSION) | sed -e 's/[^.]*\.//' -e 's/\..*//'` -ge $2 ]; then echo YES; else echo NO; fi; fi) diff --git a/mk/ghc-target.mk b/mk/ghc-target.mk index 352c933..07ad368 100644 --- a/mk/ghc-target.mk +++ b/mk/ghc-target.mk @@ -276,11 +276,6 @@ endif # whether HS_SRCS is empty or not. # -# can't split objs in way 'u', so we disable it here -ifeq "$(way)" "u" -SplitObjs = NO -endif - ifneq "$(HS_SRCS)" "" ifeq "$(SplitObjs)" "YES" _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
