summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1994-05-04 19:16:15 +0000
committerMichael I. Bushnell <mib@gnu.org>1994-05-04 19:16:15 +0000
commitae7701ab10bdfee2b3d0b0c272054333b24ea298 (patch)
treec68fa8f43af4607d432ece46f2d5ab22104bf674
parent35f89765e3f7cc21d65fec5f8a060d0ea83e5462 (diff)
Formerly Makeconf.~40~
-rw-r--r--Makeconf5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makeconf b/Makeconf
index b2e35801..5ee5ede0 100644
--- a/Makeconf
+++ b/Makeconf
@@ -27,6 +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
# Finding binaries
include $(hurdsource)/Maketools
@@ -42,11 +43,9 @@ CFLAGS := -Wall -Wno-parentheses -g
ldflags = $(addprefix -Xlinker ,$(LDFLAGS))
-# $(link) uses threads to get malloc until the one in the library is fixed.
-
define link
$(LD) -e __start $(LDFLAGS) -o $@ $(startup) \
-$(OBJS) $(LIBS) $(libthreads) $(libc) $(libgcc)
+$(OBJS) $(LIBS) $(malloc) $(libc) $(libgcc)
endef
# Mounting $(hurdroot)