diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/makefile | 14 | ||||
| -rw-r--r-- | libc/putchar.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libc/makefile b/libc/makefile index 560efb7..aec21ef 100644 --- a/libc/makefile +++ b/libc/makefile @@ -6,21 +6,21 @@ endif ifndef CFLAGS
CFLAGS = -ffreestanding -Wall -Wextra -g -std=gnu11 -O2 -Iinclude
- CFLAGS += --sysroot="$(SYSROOT)"
- CFLAGS += -isystem="/usr/include"
+ CFLAGS += --sysroot=$(SYSROOT)
+ CFLAGS += -isystem $(SYSROOT)/usr/include
endif
ifndef CXXFLAGS
CXXFLAGS = -ffreestanding -Wall -Wextra -fno-exceptions -fno-rtti -D__is_kernel -g -O2 -Iinclude
CXXFLAGS += -Iinclude
- CXXFLAGS += --sysroot="$(SYSROOT)"
- CXXFLAGS += -isystem="/usr/include"
+ CXXFLAGS += --sysroot=$(SYSROOT)
+ CXXFLAGS += -isystem $(SYSROOT)/usr/include
endif
ifndef LDFLAGS
LDFLAGS = -T arch/$(ARCH)/linker.ld -ffreestanding -g -O2 -Iinclude
- LDFLAGS += --sysroot="$(SYSROOT)"
- LDFLAGS += -isystem="/usr/include"
+ LDFLAGS += --sysroot=$(SYSROOT)
+ LDFLAGS += -isystem $(SYSROOT)/usr/include
endif
ifndef SYSROOT
@@ -76,4 +76,4 @@ install-lib: libc.a clean:
$(info [INFO] Cleaning)
- $(RM) ${OBJECTS} $(DEPFILES)
\ No newline at end of file + $(RM) ${OBJECTS} $(DEPFILES) libc.a
\ No newline at end of file diff --git a/libc/putchar.c b/libc/putchar.c index 48147bf..f0f5783 100644 --- a/libc/putchar.c +++ b/libc/putchar.c @@ -1,9 +1,11 @@ #include <stdio.h>
//#include <arch/i386/tmtty.h>
+#include <arch/x86_64/serial.h>
int putchar(int ic) {
char c = (char) ic;
+ serial_putchar(c);
//terminal_write(&c, sizeof(c));
return ic;
}
\ No newline at end of file |