Formerly Makeconf.~47~

1 files changed, 1 insertions, 14 deletions

diff --git a/Makeconf b/Makeconf
index 00d750df..5df37f3b 100644
--- a/Makeconf
+++ b/Makeconf
@@ -28,29 +28,16 @@ libpager := $(hurdinst)/lib/libpager.a
 libfshelp := $(hurdinst)/lib/libfshelp.a
 libdiskfs := $(hurdinst)/lib/libdiskfs.a
 libtrivfs := $(hurdinst)/lib/libtrivfs.a
-malloc := $(hurdinst)/lib/libmalloc.a
 
 # Finding binaries
 include $(hurdsource)/Maketools
 
-gccheaders = /usr/local/lib/gcc-lib/$(CCTARGET)/$(CCVERSION)/include
-libgcc := /usr/local/lib/gcc-lib/$(CCTARGET)/$(CCVERSION)/libgcc.a
-
 # Flags for compilation.  It is important to have -I. first for things that
 # use their own headers which are later installed; they might do `#include
 # <foo.h>' and that ignores the current directory.
-CPPFLAGS := -nostdinc -I. -I$(includedir) -I$(gccheaders)
+CPPFLAGS := -I. 
 CFLAGS := -Wall -Wno-parentheses -g
 
-# How to do some things:
-
-ldflags = $(addprefix -Xlinker ,$(LDFLAGS)) 
-
-define link
-$(LD) -e __start $(LDFLAGS) -o $@ $(startup) \
-$(OBJS) $(LIBS) -u _malloc $(malloc) $(libc) $(libgcc)
-endef
-
 # Mounting $(hurdroot)
 ifeq ($(hurdroot),)
 $(hurdroot): force