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

diff --git a/Usermode/Libraries/libc++.so_src/Makefile b/Usermode/Libraries/libc++.so_src/Makefile
index 6d070de1..72538379 100644
--- a/Usermode/Libraries/libc++.so_src/Makefile
+++ b/Usermode/Libraries/libc++.so_src/Makefile
@@ -8,14 +8,18 @@ CFLAGS   += -Wall -Werror -Wextra
 CXXFLAGS += -Wall -Werror -Wextra
 ASFLAGS  +=
 LDFLAGS  += -nostdlib
-PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o
-LIBS     += -lc $(LIBGCC_PATH) $(CRTEND) $(CRTN)
+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)