X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc%2B%2B.so_src%2FMakefile;h=82eaf7c2bf2398b4250a42a7fe7f520c916b1b19;hb=2cd79a3fd753af70c822c72a4a1c64b5ba510779;hp=c76ac4343c44bb1c6a3ea593f825e7e788c7b416;hpb=5f622fc2425565c12730738de5533e2153b04da5;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc++.so_src/Makefile b/Usermode/Libraries/libc++.so_src/Makefile
index c76ac434..82eaf7c2 100644
--- a/Usermode/Libraries/libc++.so_src/Makefile
+++ b/Usermode/Libraries/libc++.so_src/Makefile
@@ -7,7 +7,10 @@ CPPFLAGS +=
 CFLAGS   += -Wall -Werror -Wextra
 CXXFLAGS += -Wall -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -Map map.txt -lc
+LDFLAGS  += -nostdlib
+PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o
+LIBS     += -lc $(LIBGCC_PATH) $(CRTEND) $(CRTN)
+USE_CXX_LINK := yes
 
 OBJ  = misc.o new.o guard.o cxxabi.o typeinfo.o
 OBJ += string.o
@@ -15,7 +18,6 @@ OBJ += exceptions.o exception_handling.o system_error.o
 DEPFILES := $(OBJ:%.o=%.d)
 BIN = libc++.so
 ifeq ($(ARCHDIR),native)
- OBJ := $(filter-out heap.o,$(OBJ))
  BIN = libc++_acess.so
 endif