summaryrefslogtreecommitdiff
path: root/Makeconf
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1994-05-05 23:49:22 +0000
committerMichael I. Bushnell <mib@gnu.org>1994-05-05 23:49:22 +0000
commit2da19178da9ffecf48f0d154dc9c6bf43d5072f9 (patch)
tree78ba7fb56fca8a80be05c28028afde264d380e72 /Makeconf
parent8e4591583ec2f142169170c75d4ac4aca367973b (diff)
Formerly Makeconf.~42~
Diffstat (limited to 'Makeconf')
-rw-r--r--Makeconf5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makeconf b/Makeconf
index 71f4ff2e..5e321299 100644
--- a/Makeconf
+++ b/Makeconf
@@ -27,8 +27,7 @@ libioserver := $(hurdinst)/lib/libioserver.a
libpager := $(hurdinst)/lib/libpager.a
libfshelp := $(hurdinst)/lib/libfshelp.a
libdiskfs := $(hurdinst)/lib/libdiskfs.a
-#malloc := $(hurdinst)/lib/malloc.o
-malloc := -u _malloc $(libthreads) # roland
+malloc := $(hurdinst)/lib/libmalloc.a
# Finding binaries
include $(hurdsource)/Maketools
@@ -48,7 +47,7 @@ ldflags = $(addprefix -Xlinker ,$(LDFLAGS))
define link
$(LD) -e __start $(LDFLAGS) -o $@ $(startup) \
-$(OBJS) $(LIBS) $(malloc) $(libc) $(libgcc)
+$(OBJS) $(LIBS) -u _malloc $(malloc) $(libc) $(libgcc)
endef
# Mounting $(hurdroot)