From d855c6cec7df36bdbdb263e3eb531d78eff64041 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sat, 8 Sep 2012 20:33:52 +0200 Subject: [PATCH] Add warnings to userspace compile flags. --- bench/Makefile | 2 ++ crosscompilemakefile.mak | 26 +++++++++++++------------- games/Makefile | 2 ++ utils/Makefile | 2 ++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/bench/Makefile b/bench/Makefile index 4239d73c..9f50151b 100644 --- a/bench/Makefile +++ b/bench/Makefile @@ -2,6 +2,8 @@ OSROOT=.. include ../crosscompilemakefile.mak +CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra + INITRDDIR:=../initrd LOCALBINARIES:=\ benchsyscall \ diff --git a/crosscompilemakefile.mak b/crosscompilemakefile.mak index a643ec87..89d4fabb 100644 --- a/crosscompilemakefile.mak +++ b/crosscompilemakefile.mak @@ -16,21 +16,21 @@ ifeq ($(CPU),x64) CPULDFLAGS=-melf_x86_64 endif -LIBMAXSIROOT=$(OSROOT)/libmaxsi -SORTIXROOT=$(OSROOT)/sortix +LIBMAXSIROOT:=$(OSROOT)/libmaxsi +SORTIXROOT:=$(OSROOT)/sortix -LIBC=$(LIBMAXSIROOT)/start.o $(LIBMAXSIROOT)/libc.a -LIBS=$(LIBC) +LIBC:=$(LIBMAXSIROOT)/start.o $(LIBMAXSIROOT)/libc.a +LIBS:=$(LIBC) -CPPFLAGS=$(CPUDEFINES) -U_GNU_SOURCE -Ulinux -Dsortix -FLAGS=-nostdinc -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -INCLUDES=-I $(LIBMAXSIROOT)/preproc -I $(SORTIXROOT)/include +CPPFLAGS:=$(CPUDEFINES) -U_GNU_SOURCE -Ulinux -Dsortix +FLAGS:=-nostdinc -nostdlib -nostartfiles -nodefaultlibs +INCLUDES:=-I $(LIBMAXSIROOT)/preproc -I $(SORTIXROOT)/include -LD=ld -LDFLAGS=$(CPULDFLAGS) -CC=gcc -CFLAGS=$(CPUFLAGS) $(FLAGS) $(INCLUDES) -CXX=g++ -CXXFLAGS=$(CPUFLAGS) $(FLAGS) $(INCLUDES) -fno-exceptions -fno-rtti +LD:=ld +LDFLAGS:=$(CPULDFLAGS) +CC:=gcc +CFLAGS:=$(CPUFLAGS) $(FLAGS) $(INCLUDES) +CXX:=g++ +CXXFLAGS:=$(CPUFLAGS) $(FLAGS) $(INCLUDES) -fno-exceptions -fno-rtti diff --git a/games/Makefile b/games/Makefile index 7b0fb823..b3922605 100644 --- a/games/Makefile +++ b/games/Makefile @@ -2,6 +2,8 @@ OSROOT=.. include ../crosscompilemakefile.mak +CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra + INITRDDIR:=../initrd LOCALBINARIES:=\ pong \ diff --git a/utils/Makefile b/utils/Makefile index d7406f58..3935125b 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -2,6 +2,8 @@ OSROOT=.. include ../crosscompilemakefile.mak +CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra + INITRDDIR:=../initrd LOCALBINARIES:=\ init \