Remove ld -no-keep-memory workaround for amd64, and use VMEM_WARNING instead.

ok pvalchev@ brad@
This commit is contained in:
dons 2004-05-20 00:08:22 +00:00
parent f274b6c375
commit 33e46f03bf
2 changed files with 7 additions and 17 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2004/05/07 11:11:02 dons Exp $
# $OpenBSD: Makefile,v 1.17 2004/05/20 00:08:22 dons Exp $
#
# Based on Simon Marlow's port script for FreeBSD:
# $FreeBSD: ports/lang/ghc/Makefile,v 1.13 2002/08/22 12:53:38 obraun Exp $
@ -60,6 +60,9 @@ SUPDISTFILES= ghc-${V}-i386-unknown-openbsd-hc.tar.bz2:2 \
ghc-${V}-sparc-unknown-openbsd-hc.tar.bz2:2 \
ghc-${V}-amd64-unknown-openbsd-hc.tar.bz2:2
# datasize around 130M on amd64
VMEM_WARNING= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu dest
CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"

View File

@ -1,12 +1,9 @@
$OpenBSD: patch-mk_bootstrap_mk,v 1.2 2004/04/26 23:48:50 dons Exp $
$OpenBSD: patch-mk_bootstrap_mk,v 1.3 2004/05/20 00:08:22 dons Exp $
Make sure we know how to build things. I don't know why this isn't
needed on, e.g. linux
And for some reason amd64/ld doesn't like linking GHC unless I tell it
to use less memory.
--- mk/bootstrap.mk.orig Wed Feb 4 03:05:04 2004
+++ mk/bootstrap.mk Sun Apr 18 20:59:29 2004
--- mk/bootstrap.mk.orig Wed Feb 4 21:05:04 2004
+++ mk/bootstrap.mk Thu May 20 09:49:39 2004
@@ -8,6 +8,8 @@
# compile the .hc files, so we have to duplicate that functionality here.
# The result is unfortunately ugly, but we don't have another choice.
@ -16,13 +13,3 @@ to use less memory.
TOP_SAVED := $(TOP)
TOP:=$(TOP)/ghc
@@ -136,6 +138,9 @@
-u "$(UNDERSCORE)GHCziWeak_runFinalizzerBatch_closure" \
-u "$(UNDERSCORE)__stginit_Prelude"
+ifeq "$(TARGETPLATFORM)" "x86_64-unknown-openbsd"
+HC_BOOT_LD_OPTS+=-Wl,-no-keep-memory
+endif
HC_BOOT_LIBS =