Usermode/Core Libs - Fix CRT* file types

diff --git a/Usermode/Libraries/libc++.so_src/Makefile b/Usermode/Libraries/libc++.so_src/Makefile
index 6d070de..ef0372d 100644 (file)
--- a/Usermode/Libraries/libc++.so_src/Makefile
+++ b/Usermode/Libraries/libc++.so_src/Makefile
@@ -8,8 +8,8 @@ CFLAGS   += -Wall -Werror -Wextra
 CXXFLAGS += -Wall -Werror -Wextra\r
 ASFLAGS  +=\r
 LDFLAGS  += -nostdlib\r
-PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o\r
-LIBS     += -lc $(LIBGCC_PATH) $(CRTEND) $(CRTN)\r
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)\r
+LIBS     += -lc $(LIBGCC_PATH) $(CRTENDS) $(CRTN)\r
 USE_CXX_LINK := yes\r
 \r
 OBJ  = misc.o new.o guard.o cxxabi.o typeinfo.o\r

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index d5aa216..22849e0 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -7,8 +7,8 @@ CPPFLAGS +=
 CFLAGS   += -nostdlib -Wall -Werror -Wextra\r
 ASFLAGS  +=\r
 LDFLAGS  += -nostdlib\r
-PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o\r
-LIBS     += $(LIBGCC_PATH) $(CRTEND) $(CRTN)\r
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRTS)\r
+LIBS     += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)\r
 \r
 INCFILES := stdio.h stdlib.h\r
 \r

diff --git a/Usermode/Libraries/libposix.so_src/Makefile b/Usermode/Libraries/libposix.so_src/Makefile
index 69dc90a..eb2fd2f 100644 (file)
--- a/Usermode/Libraries/libposix.so_src/Makefile
+++ b/Usermode/Libraries/libposix.so_src/Makefile
@@ -7,8 +7,8 @@ CPPFLAGS +=
 CFLAGS   += -Wextra\r
 ASFLAGS  +=\r
 LDFLAGS  += -nostdlib\r
-PRELINK  += $(CRTI) $(CRTBEGIN) $(CRT0S)\r
-LIBS     += -lc $(CRTEND) $(CRTN)\r
+PRELINK  += $(CRTI) $(CRTBEGINS) $(CRT0S)\r
+LIBS     += -lc $(CRTENDS) $(CRTN)\r
 \r
 OBJ  = main.o unistd.o dirent.o stat.o utmpx.o termios.o\r
 OBJ += pwd.o syslog.o sys_time.o sys_ioctl.o sys_resource.o\r