X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc%2B%2B.so_src%2FMakefile;h=72538379f47c0e1b39788ff9d576ffee560c71af;hb=5b487e31cf5145372e9777e9f82a8cd661d4f1b4;hp=6cec94f11e6bf5f5abe329f4ea7a2db9f32c4486;hpb=b7d9f86f7a1c23be18b50d5c647fd5d3c08369c3;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc++.so_src/Makefile b/Usermode/Libraries/libc++.so_src/Makefile
index 6cec94f1..72538379 100644
--- a/Usermode/Libraries/libc++.so_src/Makefile
+++ b/Usermode/Libraries/libc++.so_src/Makefile
@@ -7,13 +7,22 @@ CPPFLAGS +=
 CFLAGS   += -Wall -Werror -Wextra
 CXXFLAGS += -Wall -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -Map map.txt -lc
+LDFLAGS  += -nostdlib
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)
+LIBS     += -lc $(LIBGCC_PATH) $(CRTENDS) $(CRTN)
+USE_CXX_LINK := yes
 
 OBJ  = misc.o new.o guard.o cxxabi.o typeinfo.o
+OBJ += string.o mutex.o
+OBJ += exceptions.o exception_handling.o system_error.o
+OBJ += gxx_personality.o
+ifeq ($(ARCHDIR),native)
+# - Include libgcc_eh (separate in linux), and the linux libc (space avoids hack in Makefile.tpl)
+LIBS += -lgcc_eh -l c
+endif
 DEPFILES := $(OBJ:%.o=%.d)
 BIN = libc++.so
 ifeq ($(ARCHDIR),native)
- OBJ := $(filter-out heap.o,$(OBJ))
  BIN = libc++_acess.so
 endif