Skip to content

Commit

Permalink
fixed GCC version
Browse files Browse the repository at this point in the history
  • Loading branch information
sduverger committed Oct 16, 2019
1 parent aa5d94c commit d570bdf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ LDSCRIPT := $(BIN_DIR)/linker.lds
MAKEFLAGS := --no-print-directory

CC_MODEL := small
CCVER := 4.8
CC := $(shell which gcc-$(CCVER))
CPP := $(shell which cpp-$(CCVER))
#CCVER := 4.8
#CC := $(shell which gcc-$(CCVER))
#CPP := $(shell which cpp-$(CCVER))
CC := $(shell which gcc)
CPP := $(shell which cpp)
LD := $(shell which ld)
RM := $(shell which rm)
MKDIR := $(shell which mkdir)
DOXYGEN := $(shell which doxygen)
MAKE := $(shell which make)
MAKE := $(shell which make)
CP := $(shell which cp)
SED := $(shell which sed)
FIND := $(shell which find)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A default kernel configuration is available but this set of features allows to e
Note : CrashOS is a work in progress. Please report any issue [here](https://github.com/airbus-seclab/crashos/issues).

# Hardware and software requirements
CrashOS only works on Intel x86 hardware architecture, requires gcc-4.8 to be compiled and GRUB to boot.
CrashOS only works on Intel x86 hardware architecture, requires gcc-multilib (to be compiled on x86-64) and GRUB to boot.

# Installation
To install CrashOS, first compile the project with the main Makefile. It will create the 32-bits executable [test.bin](https://github.com/airbus-seclab/crashos/blob/master/build/test.bin).
Expand Down
2 changes: 2 additions & 0 deletions src/core/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ void video_write(char *buffer)
{
case '\n':
video.ln++;
video.cl = 0;
break;
case '\r':
video.cl = 0;
break;
Expand Down

0 comments on commit d570bdf

Please sign in to comment.