ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tup: rename INCLUDES to CPPFLAGS

This commit is contained in:
Ehmry - 2019-10-06 14:27:28 +02:00
parent 3c8117e555
commit c67d81dc99
20 changed files with 67 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tuprules.tup
View File

@ -71,7 +71,8 @@ export PKG_CONFIG_PATH
PKG_CONFIG_DIR = $(DEV_DIR)/lib/pkgconfig
PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_DIR):$PKG_CONFIG_PATH pkg-config
DEFINES += -g
CFLAGS += -g
CXXFLAGS += -g
ifdef OLEVEL
OLEVEL = @(OLEVEL)
@ -79,13 +80,13 @@ else
OLEVEL = -O0
endif
!ir = | $(GENODE_DIR)/<pkg-config> |> clang $(OLEVEL) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -S -emit-llvm %f |> %B.ll
!ir = | $(GENODE_DIR)/<pkg-config> |> clang $(OLEVEL) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(CPPFLAGS) -S -emit-llvm %f |> %B.ll
!asm = |> ^ CC %b^ @(CC_WRAPPER) $(CC) $(OLEVEL) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) -D__ASSEMBLY__ $(INCLUDES) -c %f -o %o |> %B.o
!asm = |> ^ CC %b^ @(CC_WRAPPER) $(CC) $(OLEVEL) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) -D__ASSEMBLY__ $(CPPFLAGS) -c %f -o %o |> %B.o
!cc = | $(GENODE_DIR)/<pkg-config> |> ^o CC %f^ @(CC_WRAPPER) $(CC) $(OLEVEL) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) $(INCLUDES) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` -c -fPIC %f -o %o |> %B.o
!cc = | $(GENODE_DIR)/<pkg-config> |> ^o CC %f^ @(CC_WRAPPER) $(CC) $(OLEVEL) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) $(CPPFLAGS) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` -c -fPIC %f -o %o |> %B.o
!cxx = | $(GENODE_DIR)/<pkg-config> |> ^o CXX %b^ @(CC_WRAPPER) $(CXX) $(OLEVEL) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) $(INCLUDES) `$(PKG_CONFIG) --cflags $(LIBS)` -c -fPIC %f -o %o |> %B.o
!cxx = | $(GENODE_DIR)/<pkg-config> |> ^o CXX %b^ @(CC_WRAPPER) $(CXX) $(OLEVEL) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) $(CPPFLAGS) `$(PKG_CONFIG) --cflags $(LIBS)` -c -fPIC %f -o %o |> %B.o
!ld = | $(GENODE_DIR)/<lib> $(GENODE_DIR)/<pkg-config> |> ^o LD %o^ $(LD) $(LDFLAGS) `$(PKG_CONFIG) --libs $(LIBS)` --whole-archive --start-group %f --no-whole-archive --end-group -o %o |>

6
repos/base-linux/src/Tuprules.tup
View File

@ -2,6 +2,6 @@ ifndef LINUX_HEADERS
error CONFIG_LINUX_HEADERS not defined
endif
INCLUDES += -I$(TUP_CWD)/include
INCLUDES += -I$(BASE_DIR)/src/include
INCLUDES += -I@(LINUX_HEADERS)/include
CPPFLAGS += -I$(TUP_CWD)/include
CPPFLAGS += -I$(BASE_DIR)/src/include
CPPFLAGS += -I@(LINUX_HEADERS)/include

4
repos/base-linux/src/core/Tupfile
View File

@ -2,9 +2,9 @@
include_rules
GEN_CORE_DIR = $(BASE_DIR)/src/core
DEFINES += -D_GNU_SOURCE
CPPFLAGS += -D_GNU_SOURCE
INCLUDES += \
CPPFLAGS += \
-I$(REP_DIR)/src/core/include \
-I$(GEN_CORE_DIR)/include \

2
repos/base-linux/src/lib/base/Tupfile
View File

@ -1,6 +1,6 @@
include_rules
INCLUDES += -I$(REP_DIR)/src/lib/syscall
CPPFLAGS += -I$(REP_DIR)/src/lib/syscall
BASE_LIB_DIR = $(BASE_DIR)/src/lib/base

8
repos/base-linux/src/lib/ld/Tupfile
View File

@ -1,7 +1,7 @@
include_rules
ifeq (@(TUP_ARCH),x86_64)
INCLUDES += -I$(BASE_DIR)/src/lib/ldso/spec/x86_64
CPPFLAGS += -I$(BASE_DIR)/src/lib/ldso/spec/x86_64
endif
LDSO_DIR = $(BASE_DIR)/src/lib/ldso
@ -10,10 +10,8 @@ ifeq (@(TUP_ARCH),x86_64)
LDSO_SPEC_DIR = $(LDSO_DIR)/spec/x86_64
endif
INCLUDES += -I$(LDSO_SPEC_DIR)
INCLUDES = -I$(LDSO_DIR)/include $(INCLUDES)
DEFINES += -fPIC
CPPFLAGS += -I$(LDSO_SPEC_DIR)
CPPFLAGS = -I$(LDSO_DIR)/include $(CPPFLAGS)
: foreach $(LDSO_DIR)/*.cc |> !cxx |> {obj}
: foreach $(LDSO_SPEC_DIR)/*.s |> !asm |> {obj}

2
repos/base-linux/src/lib/lx_hybrid/Tupfile
View File

@ -1,6 +1,6 @@
include_rules
INCLUDES += -I$(REP_DIR)/src/lib/syscall
CPPFLAGS += -I$(REP_DIR)/src/lib/syscall
: foreach *.cc $(BASE_DIR)/src/lib/cxx/new_delete.cc |> !cxx |> {obj}
: foreach *.c |> !cc |> {obj}

8
repos/base-linux/src/timer/linux/Tupfile
View File

@ -5,11 +5,11 @@ BASE_TIMER_DIR = $(BASE_DIR)/src/timer
PERIODIC_DIR = $(BASE_TIMER_DIR)/periodic
INCLUDES += -I$(BASE_TIMER_DIR)/include
INCLUDES += -I$(PERIODIC_DIR)
INCLUDES += -I$(REP_DIR)/src/lib/syscall
CPPFLAGS += -I$(BASE_TIMER_DIR)/include
CPPFLAGS += -I$(PERIODIC_DIR)
CPPFLAGS += -I$(REP_DIR)/src/lib/syscall
INCLUDES = -I. $(INCLUDES)
CPPFLAGS = -I. $(CPPFLAGS)
#TODO: ^ FAIL
: foreach $(BASE_TIMER_DIR)/*.cc |> !cxx |> %B.linux.o {obj}

6
repos/base-nova/Tuprules.tup
View File

@ -1,12 +1,12 @@
ifeq (@(TUP_ARCH),x86_32)
INCLUDES += -I$(TUP_CWD)/include/spec/64bit
CPPFLAGS += -I$(TUP_CWD)/include/spec/64bit
endif
ifeq (@(TUP_ARCH),x86_64)
INCLUDES += -I$(TUP_CWD)/include/spec/64bit
CPPFLAGS += -I$(TUP_CWD)/include/spec/64bit
endif
INCLUDES += -I$(TUP_CWD)/include
CPPFLAGS += -I$(TUP_CWD)/include
include &(BASE_DIR)/Tuprules.tup
REP_DIR = $(TUP_CWD)

2
repos/base-nova/src/Tuprules.tup
View File

@ -1 +1 @@
INCLUDES = -I$(TUP_CWD)/include -I$(BASE_DIR)/src/include $(INCLUDES)
CPPFLAGS = -I$(TUP_CWD)/include -I$(BASE_DIR)/src/include $(CPPFLAGS)

2
repos/base-nova/src/core/Tupfile
View File

@ -1,7 +1,7 @@
include_rules
GEN_CORE_DIR = $(BASE_DIR)/src/core
INCLUDES += \
CPPFLAGS += \
-I$(TUP_CWD)/include \
-I$(GEN_CORE_DIR)/include \

8
repos/base-nova/src/lib/ld/Tupfile
View File

@ -1,5 +1,5 @@
include_rules
INCLUDES += -I$(BASE_DIR)/src/include
CPPFLAGS += -I$(BASE_DIR)/src/include
LDSO_DIR = $(BASE_DIR)/src/lib/ldso
@ -7,10 +7,8 @@ ifeq (@(TUP_ARCH),x86_64)
LDSO_SPEC_DIR = $(LDSO_DIR)/spec/x86_64
endif
INCLUDES += -I$(LDSO_SPEC_DIR)
INCLUDES += -I$(LDSO_DIR)/include
DEFINES += -fPIC
CPPFLAGS += -I$(LDSO_SPEC_DIR)
CPPFLAGS += -I$(LDSO_DIR)/include
: foreach $(LDSO_DIR)/*.cc |> !cxx |> {obj}
: foreach $(LDSO_SPEC_DIR)/*.s |> !asm |> {obj}

4
repos/base-nova/src/timer/nova/Tupfile
View File

@ -3,8 +3,8 @@ include_rules
BASE_TIMER_DIR = $(BASE_DIR)/src/timer
INCLUDES += -I$(BASE_TIMER_DIR)/include
INCLUDES += -I.
CPPFLAGS += -I$(BASE_TIMER_DIR)/include
CPPFLAGS += -I.
#TODO: ^ FAIL
: foreach *.cc $(BASE_TIMER_DIR)/*.cc |> !cxx |> %B.nova.o {obj}

32
repos/base/Tuprules.tup
View File

@ -1,50 +1,46 @@
REP_DIR = $(TUP_CWD)
ifeq (@(TUP_ARCH),i386)
INCLUDES += -I$(BASE_DIR)/include/spec/x86_32
INCLUDES += -I$(BASE_DIR)/include/spec/x86
INCLUDES += -I$(BASE_DIR)/include/spec/32bit
CPPFLAGS += -I$(BASE_DIR)/include/spec/x86_32
CPPFLAGS += -I$(BASE_DIR)/include/spec/x86
CPPFLAGS += -I$(BASE_DIR)/include/spec/32bit
endif
ifeq (@(TUP_ARCH),x86_64)
INCLUDES += -I$(BASE_DIR)/include/spec/x86_64
INCLUDES += -I$(BASE_DIR)/include/spec/x86
INCLUDES += -I$(BASE_DIR)/include/spec/64bit
CPPFLAGS += -I$(BASE_DIR)/include/spec/x86_64
CPPFLAGS += -I$(BASE_DIR)/include/spec/x86
CPPFLAGS += -I$(BASE_DIR)/include/spec/64bit
endif
ifeq (@(TUP_ARCH),arm64)
INCLUDES += -I$(BASE_DIR)/include/spec/arm_64
INCLUDES += -I$(BASE_DIR)/include/spec/64bit
CPPFLAGS += -I$(BASE_DIR)/include/spec/arm_64
CPPFLAGS += -I$(BASE_DIR)/include/spec/64bit
endif
INCLUDES += -I$(BASE_DIR)/include
CPPFLAGS += -I$(BASE_DIR)/include
# Override base macros to bypass pkg-config
DEFINES += \
CXXFLAGS += \
-ffunction-sections \
-fno-strict-aliasing \
-fPIC \
-g \
-nostdinc \
-Wall \
CXXFLAGS += \
-std=gnu++17 \
GCC_INCLUDE = -I`$(CC) -print-file-name=include`
!cc = |> ^ COMPILE %b^ \
@(CC_WRAPPER) $(CC) $(DEFINES) $(OLEVEL) \
@(CC_WRAPPER) $(CC) $(OLEVEL) -fPIC \
$(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) \
$(INCLUDES) $(GCC_INCLUDE) $(CC_MARCH) \
$(CPPFLAGS) $(GCC_INCLUDE) $(CC_MARCH) \
-c %f -o %o \
|> %B.o
!cxx = |> ^ COMPILE %b^ \
@(CC_WRAPPER) $(CXX) $(DEFINES) $(OLEVEL) \
@(CC_WRAPPER) $(CXX) $(OLEVEL) -fPIC \
$(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) \
$(INCLUDES) $(GCC_INCLUDE) $(CC_MARCH) \
$(CPPFLAGS) $(GCC_INCLUDE) $(CC_MARCH) \
-c %f -o %o \
|> %B.o

2
repos/base/src/Tuprules.tup
View File

@ -1 +1 @@
INCLUDES += -I$(REP_DIR)/src/include
CPPFLAGS += -I$(REP_DIR)/src/include

10
repos/base/src/lib/cxx/Tupfile
View File

@ -16,11 +16,13 @@ endif
include_rules
DEFINES = -ffunction-sections -fno-strict-aliasing -g -fPIC
# drop the standard defines to avoid -nostdinc
COMMON_FLAGS = -ffunction-sections -fno-strict-aliasing
INCLUDES += -I@(LIBCXX)/include/c++/v1
INCLUDES += -I@(LIBCXXABI)/include
CFLAGS += $(COMMON_FLAGS)
CXXFLAGS += $(COMMON_FLAGS)
CPPFLAGS += -I@(LIBCXX)/include/c++/v1
CPPFLAGS += -I@(LIBCXXABI)/include
LLVM_LIBS += @(LIBCXXABI)/lib/libc++abi.a

2
repos/base/src/lib/timeout/Tupfile
View File

@ -1,5 +1,5 @@
include_rules
INCLUDES += $(REP_DIR)/src/include
CPPFLAGS += $(REP_DIR)/src/include
SRC_CC += \
duration.cc \

12
repos/os/Tuprules.tup
View File

@ -1,19 +1,19 @@
REP_DIR = $(TUP_CWD)
ifeq (@(TUP_ARCH),i386)
INCLUDES += -I$(REP_DIR)/include/spec/x86_32
INCLUDES += -I$(REP_DIR)/include/spec/x86
CPPFLAGS += -I$(REP_DIR)/include/spec/x86_32
CPPFLAGS += -I$(REP_DIR)/include/spec/x86
endif
ifeq (@(TUP_ARCH),x86_64)
INCLUDES += -I$(REP_DIR)/include/spec/x86_64
INCLUDES += -I$(REP_DIR)/include/spec/x86
CPPFLAGS += -I$(REP_DIR)/include/spec/x86_64
CPPFLAGS += -I$(REP_DIR)/include/spec/x86
endif
ifeq (@(TUP_ARCH),arm)
INCLUDES += -I$(REP_DIR)/include/spec/arm
CPPFLAGS += -I$(REP_DIR)/include/spec/arm
endif
INCLUDES += -I$(REP_DIR)/include
CPPFLAGS += -I$(REP_DIR)/include
CXXFLAGS += -std=gnu++17

2
repos/os/src/drivers/ahci/Tuprules.tup
View File

@ -1,2 +1,2 @@
INCLUDES += -I$(TUP_CWD)
CPPFLAGS += -I$(TUP_CWD)
SRC_CC = $(TUP_CWD)/*.cc

2
repos/os/src/drivers/input/spec/ps2/Tuprules.tup
View File

@ -1 +1 @@
INCLUDES += -I$(TUP_CWD)
CPPFLAGS += -I$(TUP_CWD)

14
repos/os/src/lib/blit/Tupfile
View File

@ -1,24 +1,24 @@
include_rules
ifeq (@(TUP_ARCH),i386)
BLIT_INCLUDES += -Ispec/x86_32
BLIT_INCLUDES += -Ispec/x86
BLIT_CPPFLAGS += -Ispec/x86_32
BLIT_CPPFLAGS += -Ispec/x86
endif
ifeq (@(TUP_ARCH),x86_64)
BLIT_INCLUDES += -Ispec/x86_64
BLIT_INCLUDES += -Ispec/x86
BLIT_CPPFLAGS += -Ispec/x86_64
BLIT_CPPFLAGS += -Ispec/x86
endif
ifeq (@(TUP_ARCH),arm)
BLIT_INCLUDES += -Ispec/arm
BLIT_CPPFLAGS += -Ispec/arm
endif
ifeq ($(BLIT_INCLUDES),)
ifeq ($(BLIT_CPPFLAGS),)
error blit library not yet ported to @(TUP_ARCH)
endif
INCLUDES += $(BLIT_INCLUDES)
CPPFLAGS += $(BLIT_CPPFLAGS)
: foreach *.cc |> !cxx |> {obj}
: {obj} |> !ar |> {bin}