RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:07:46 +00:00
Code Issues Activity Actions

Build: Use the GCC port if building on "SerenityOS" :^)

Browse source
This commit is contained in:
Andreas Kling 2020-04-20 18:29:13 +02:00
parent cff68af965
commit 50218f7edc
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Makefile
View file

@ -143,8 +143,16 @@ PROGRAM = kernel
SUBPROJECT_CXXFLAGS += -pie -fPIE -ffreestanding -fbuiltin -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables SUBPROJECT_CXXFLAGS += -pie -fPIE -ffreestanding -fbuiltin -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables
SUBPROJECT_CXXFLAGS += -nostdlib -nostdinc -nostdinc++ $(SERENITY_KERNEL_CUSTOM_CXXFLAGS) SUBPROJECT_CXXFLAGS += -nostdlib -nostdinc -nostdinc++ $(SERENITY_KERNEL_CUSTOM_CXXFLAGS)
SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/
SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/i686-pc-serenity/ UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),SerenityOS)
SUBPROJECT_CXXFLAGS += -I/usr/local/include/c++/9.3.0/
SUBPROJECT_CXXFLAGS += -I/usr/local/include/c++/9.3.0/i686-pc-serenity/
else
SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/
SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/i686-pc-serenity/
endif
LDFLAGS += -Wl,-T linker.ld -nostdlib -lgcc -lstdc++ $(SERENITY_KERNEL_CUSTOM_LDFLAGS) LDFLAGS += -Wl,-T linker.ld -nostdlib -lgcc -lstdc++ $(SERENITY_KERNEL_CUSTOM_LDFLAGS)

23
Makefile.common
View file

@ -22,8 +22,9 @@ INCLUDE_FLAGS += \
VERBOSE = 0 VERBOSE = 0
UNAME_S := $(shell uname -s)
ifneq ($(USE_HOST_CXX),) ifneq ($(USE_HOST_CXX),)
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),OpenBSD) ifeq ($(UNAME_S),OpenBSD)
HOST_CXX ?= clang++ HOST_CXX ?= clang++
endif endif
@ -42,13 +43,19 @@ ifneq ($(USE_HOST_CXX),)
OBJ_SUFFIX ?= .host OBJ_SUFFIX ?= .host
ARCH = $(shell arch -s) ARCH = $(shell arch -s)
else else
TOOLCHAIN_PATH = $(SERENITY_BASE_DIR)/Toolchain/Local/bin ifeq ($(UNAME_S),SerenityOS)
CXX = $(PRE_CXX) $(TOOLCHAIN_PATH)/i686-pc-serenity-g++ TOOLCHAIN_PREFIX =
CC = $(PRE_CC) $(TOOLCHAIN_PATH)/i686-pc-serenity-gcc else
AS = $(TOOLCHAIN_PATH)/i686-pc-serenity-as TOOLCHAIN_PATH = $(SERENITY_BASE_DIR)/Toolchain/Local/bin
LINK = $(TOOLCHAIN_PATH)/i686-pc-serenity-ld TOOLCHAIN_PREFIX = $(TOOLCHAIN_PATH)/i686-pc-serenity-
RANLIB = $(TOOLCHAIN_PATH)/i686-pc-serenity-ranlib endif
AR = $(TOOLCHAIN_PATH)/i686-pc-serenity-ar
CXX = $(PRE_CXX) $(TOOLCHAIN_PREFIX)g++
CC = $(PRE_CC) $(TOOLCHAIN_PREFIX)gcc
AS = $(TOOLCHAIN_PREFIX)as
LINK = $(TOOLCHAIN_PREFIX)ld
RANLIB = $(TOOLCHAIN_PREFIX)ranlib
AR = $(TOOLCHAIN_PREFIX)ar
ARCH = i386 ARCH = i386
DEFINES += -DDEBUG DEFINES += -DDEBUG