diff options
Diffstat (limited to 'lang/ghc/patches/patch-aa')
-rw-r--r-- | lang/ghc/patches/patch-aa | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/lang/ghc/patches/patch-aa b/lang/ghc/patches/patch-aa index d97d37b1509..4ff0397df5f 100644 --- a/lang/ghc/patches/patch-aa +++ b/lang/ghc/patches/patch-aa @@ -1,36 +1,12 @@ -$NetBSD: patch-aa,v 1.4 2003/04/29 12:16:19 augustss Exp $ +$NetBSD: patch-aa,v 1.5 2004/05/29 14:28:43 kristerw Exp $ ---- ./mk/bootstrap.mk.orig Tue May 14 10:25:46 2002 -+++ ./mk/bootstrap.mk Fri Mar 28 23:48:02 2003 -@@ -123,10 +123,22 @@ +--- mk/bootstrap.mk.orig Tue May 25 22:00:52 2004 ++++ mk/bootstrap.mk Tue May 25 22:01:59 2004 +@@ -136,6 +136,7 @@ + -u "$(UNDERSCORE)GHCziWeak_runFinalizzerBatch_closure" \ + -u "$(UNDERSCORE)__stginit_Prelude" - HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) ++HC_BOOT_LD_OPTS += -Wl,-R@PREFIX@/lib -+# XXX_UB: if we build ghc/utils with hc-bootstrapped compiler+libs, -+# the link fails, libHSrts uses a (new) symbol from libHSbase. -+# Maybe we should insert a ranlib somewhere? -+# Workaround the problem: -+HC_BOOT_LIBS += -lHSbase -+ - ifeq "$(GhcLibsWithReadline)" "YES" - HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline)) -+HC_BOOT_LIBS += $(ExtraLdOptsReadline) -+ifneq "$(ReadlineIncludePath)" "" -+HC_BOOT_CC_OPTS += -I$(ReadlineIncludePath) -+endif - endif + HC_BOOT_LIBS = -+HC_BOOT_LIBS += $(ExtraLdOptsGmp) -+ - ifeq "$(HaveLibDL)" "YES" - HC_BOOT_LIBS += -ldl - endif -@@ -149,7 +161,7 @@ - $(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I. `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'` - - %.s : %.raw_s -- $(FPTOOLS_TOP)/$(GHC_MANGLER_DIR)/$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS))) -+ $(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS))) - - %.o : %.s - $(CC) -c -o $@ $< |